Revert "Currently broken by recent LLVM upstream changes"

This reverts commit r296579, which is not needed anymore as the relevant changes
in trunk have been reverted.

llvm-svn: 296817