[hibernate-issues] [JIRA] (HHH-9194) Revert HHH-8908 fix