Follow up for #51471