Speculatively revert r123384 to make llvm-gcc-i386-linux-selfhost buildbot happy.