[hibernate-issues] [JIRA] (HHH-12723) Revert changes applied by HHH-12585