This revert the commit because it broke the bots. I need to find a way that works with both versions. llvm-svn: 355364