Revert 105540, 105542, 105544, 105546, and 105548 to unbreak bootstrapping.