Only override if you really mean it.

2 files changed, 3 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index 29a758fee74..12613018ca7 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -641,6 +641,8 @@ public final class ContainerCluster
         }
         if (jvmGCOptions != null) {
             jvmBuilder.gcopts(jvmGCOptions);
+        } else {
+            jvmBuilder.gcopts(G1GC);
         }
         builder.jvm(jvmBuilder);
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index 35c6a0a8198..0be25808541 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -463,7 +463,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         if (jvmGCOPtions != null) {
             return jvmGCOPtions;
         } else if ((zone.system() == SystemName.dev) || isHostedVespa) {
-            return ContainerCluster.G1GC;
+            return null;
         } else {
             return ContainerCluster.CMS;
         }