This reverts commit 44a63f6a. It segfaults on an internal test case (will follow up off thread). llvm-svn: 356623