This reverts commit 6e8f1a80. Reverting patch while investigating build bot failure. llvm-svn: 361143