Revert 316150 which reinstated r316025.

It fails on some bots and now we know how to reproduce it.


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