Synchronize ear archetype with kitchensink quickstart changes

Again, this change needs thorough review. :-)