This reverts commit rL373317 due to test failure on the
clang-s390x-linux build bot.

llvm-svn: 373336