Retreat some too drastic design unifications.