Revert r165661, "Patch by Shuxin Yang <shuxin.llvm@gmail.com>."