[hibernate-dev] Revert API change in org.hibernate.Query