I know this got reverted last time because it was causing some tests to timeout. I don't know what was causing that hang, but does this fix it? http://reviews.llvm.org/D6575