Revert _evaluate.py changes from #46436 on mohessie/standardize_output_schema
#46835
+10
−9