Revert r251680: