Already fixed as #31841. Closing and merging.