This reverts r364557 (git commit 9f7f5858) This crashes as reported on the commit thread. Repro instructions TBD. llvm-svn: 364876