Revert r109079, which broke a lot of CodeGen tests.