Revert r179409 because it caused some warnings and some of the build bots fail.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179418 91177308-0d34-0410-b5e6-96231b3b80d8