Revert eval.php changes from r54653, r54312, r54225 (maintenance-work branch merge...