This commit broke the ASan buildbot. See comments in rL372376 for more information. This reverts commit 15e27b0b. llvm-svn: 372425