Actually, I take that back. We should simply remove org.hibernate.ejb.HibernatePersistence and its service registry.