implemented somewhat differently than before, but it should have
the same functionality and the previous testcase passes again.

llvm-svn: 78900