Revert r191062; the build break was also fixed in a different (incompatible) way in r191060.


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