Temporarily revert r72191. It was causing an assert during llvm-gcc