Already fixed as #31481.