Revert r153694. It was causing failures in the buildbots.

llvm-svn: 153701
GitOrigin-RevId: 76fdc4b885794df96f85d370f64a22f2b5e6b24a
57 files changed