Apparently, Arcanist didn't include some of my local changes in my previous commit attempt. llvm-svn: 239523