Remove PersistenceContextScope.NONE for now