issue #21189: do not always requery