Temporarily revert parts of r136702 to make cmake builds happy.

Someone with more cmake experience want to throw me a bone? :)

llvm-svn: 136709