Follow up on #16408

[skip ci]