Unrevert r152761 (reverted in r152772) with a fix for the issue which was

breaking bootstrap. No test yet: it's quite hard to tickle the failure case.
The specific testcase for this wouldn't be useful for testing anything more
general than a reintroduction of this precise bug in any case.

llvm-svn: 152775