Also, this is really part of #22607.