[hibernate-issues] [JIRA] (HHH-12722) Consider reverting HHH-12585