Revert r123419. It still breaks llvm-gcc-i386-linux-selfhost.