[hibernate-commits] [hibernate/hibernate-orm] 840ec4: Revert HHH-16616 backport