[hibernate-issues] [JIRA] (OGM-588) Revert work-around required due to ORM version update