Broke the msan buildbots (see comments on rL372318 for more details). This reverts commit eb231d15. llvm-svn: 372353