1 files changed, 2 insertions, 4 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
index 4b26769b1fb..efa1cd3745d 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
@@ -40,16 +40,14 @@ public class CapacityPolicies {
         }
     }
 
-    public Flavor decideFlavor(Capacity requestedCapacity, ClusterSpec cluster, Optional<String> defaultFlavorOverride) {
+    public Flavor decideFlavor(Capacity requestedCapacity, ClusterSpec cluster) {
         // for now, always use the requested flavor if a docker flavor is requested
         Optional<String> requestedFlavor = requestedCapacity.flavor();
         if (requestedFlavor.isPresent() &&
             flavors.getFlavorOrThrow(requestedFlavor.get()).getType() == Flavor.Type.DOCKER_CONTAINER)
             return flavors.getFlavorOrThrow(requestedFlavor.get());
 
-        String defaultFlavorName = defaultFlavorOverride.isPresent() ?
-                defaultFlavorOverride.get() : zone.defaultFlavor(cluster.type());
-
+        String defaultFlavorName = zone.defaultFlavor(cluster.type());
         switch(zone.environment()) {
             case dev : case test : case staging : return flavors.getFlavorOrThrow(defaultFlavorName);
             default : return flavors.getFlavorOrThrow(requestedFlavor.orElse(defaultFlavorName));