Revert r334980 and 334983

This reverts commits r334980 and r334983 because they were causing build
timeouts on the x86_64-linux-ubsan bot.

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