buildbot failure. This reverts commit d07d6d6177 and c774f687b6. llvm-svn: 359034
d07d6d6177
c774f687b6