This reverts commit 44703217f7. http://www.llvm.org/bugs/show_bug.cgi?id=6429 has been fixed now. Things appear to be working reasonably so far.
44703217f7