This reverts r360171 (git commit a9d6c32e). A repro showing the asan/msan failures is forthcoming. llvm-svn: 360481