Missing commits from r66268, revert class rename in r66267