Revert r78621.  This was not a critical fix and we're in rc mode.
1 file changed