Revert r243250