Fixed #21750 -- Fixed regression introduced by 4befb30.