Reapply 105540, 105542, and 105548, and revert r105732.