1 files changed, 5 insertions, 11 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 f1f210b013c..f1d5c7c9220 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
@@ -164,18 +164,12 @@ public class ContentCluster extends TreeConfigProducer<AnyConfigProducer> implem
                                                                       DeployState deployState,
                                                                       ContentCluster c,
                                                                       ClusterResourceLimits resourceLimits) {
-            var config = new ClusterControllerConfig.Builder(c.clusterId,
-                                                             contentElement,
-                                                             resourceLimits.getClusterControllerLimits(),
-                                                             deployState.featureFlags()
-                                                                        .allowMoreThanOneContentGroupDown(new ClusterSpec.Id(c.clusterId)))
+            return new ClusterControllerConfig.Builder(c.clusterId,
+                                                       contentElement,
+                                                       resourceLimits.getClusterControllerLimits(),
+                                                       deployState.featureFlags()
+                                                                  .allowMoreThanOneContentGroupDown(new ClusterSpec.Id(c.clusterId)))
                     .build(deployState, c, contentElement.getXml());
-            config.tuning().maxGroupsAllowedDown().ifPresent(m -> {
-                int numberOfLeafGroups = c.getRootGroup().getNumberOfLeafGroups();
-                if (m > numberOfLeafGroups)
-                    throw new IllegalArgumentException("Cannot set max-groups-allowed-down (" + m + ") larger than number of groups (" + numberOfLeafGroups + ")");
-            });
-            return config;
         }
 
         private void setupSearchCluster(ContentSearchCluster csc, ModelElement element, DeployLogger logger) {