Revert r23166, 23178, 23179, and probably some other related bits.