Update code to create and save entity.

The additional defaults are no longer applied to existing entities. All
entities returned from findOrCreate() will always be persisted.