revert r46742