This should have been part of r224676.