rolled back to Hibernate 3