This was meant to be a part of r360158, but I forgot to squash the commits before pushing. llvm-svn: 360168