reverting my patch, cause build problems

llvm-svn: 250257
18 files changed