While the clang patch is reverted pending investigation/fixes. This reverts commit r225001. llvm-svn: 225560