Follow up from r231497. Using XFAIL would still trigger fail on some buildbots. Will re-introduce it as soon as I have a fix. llvm-svn: 231505