I think I have a fix for this, but it needs review. This should keep the bots happy until then. llvm-svn: 295047