This reverts r358628 (git commit 91a06bee) while investigating a crash reproducer bot failure. llvm-svn: 358634