This reverts r371286 (git commit b38105bb) r371286 caused build bots' failure. I'll check it. llvm-svn: 371289