Revert r136503 and r136480 in an effort to fix non-determinism in the llvm-gcc buildbots on i386.  Devang is looking into the root cause.

llvm-svn: 136674