Revert Mon Ping's change 99928, since it broke all the llvm-gcc buildbots.