[hibernate-issues] [JIRA] (HHH-16720) Fix for HHH-15759 broke our code