refs #23112
(follows 23e5fee6)
this, and linked commit must be merged to testing (was missed before, main cause of #23112)
