Revert r136503 and r136480 in an effort to fix non-determinism in the llvm-gcc buildb...