partially revert r33403