This reverts commit b1752f67. Fixed the issue with a different commit, reapply this one as it was, afaik, not broken. llvm-svn: 369303