Revert r176166 because it broke one of the lit tests.