Temporarily revert r274774.