Revert r229543.

Reverting this while build bot failures are investigated.

llvm-svn: 229550
2 files changed