This reverts commit r256008. Its breaking multiple buildbots, although works for me locally. llvm-svn: 256013