Reverting the commit 116986. It was breaking the build on llvm-x86_64-linux though it

compiles on OS X. I'll ensure that it builds on a linux machine before committing
again.

llvm-svn: 116991