This reverts commit 8e462754. This was failing on sanitizer-x86_64-linux and our internal CI. llvm-svn: 366618