Fix #16880: regression introduced by original patch