Part of #22854.