Simplify defaulting logic

1 files changed, 1 insertions, 5 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
index 3c0e9878f19..b4f8889690e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
@@ -597,7 +597,7 @@ public class ContentCluster extends AbstractConfigProducer implements StorDistri
      * in config and not remove it again if they reduce the node count.
      */
     public int distributionBits() {
-        if (zone.environment() == Environment.prod) {
+        if (zone.environment() == Environment.prod && ! zone.equals(Zone.defaultZone())) {
             return 16;
         }
         else { // hosted test zone, or self-hosted system
@@ -607,10 +607,6 @@ public class ContentCluster extends AbstractConfigProducer implements StorDistri
         }
     }
 
-    private Zone createZone(Environment environment, String region) {
-        return new Zone(environment, RegionName.from(region));
-    }
-
     @Override
     public void validate() throws Exception {
         super.validate();