Followup after #5604 moved to #5629
Followup after #5604
moved to #5629