Temporarily revert r74494. It was causing failures in the unit tests.