Revert r32696