Revert [83608]. Unbreak regression tests.

svn path=/trunk/status/; revision=83611