This reverts commit 681b0798. Reverted due to causing build failures: llvm-svn: 357772 llvm-svn: 357774