This reverts commit 9f5960e004 to fix
buildbots reported here https://lab.llvm.org/buildbot/#/builders/230/builds/19412.
This reverts commit 9f5960e004 to fix
buildbots reported here https://lab.llvm.org/buildbot/#/builders/230/builds/19412.