Clean up the dispatch protobuf flag too.

1 files changed, 1 insertions, 4 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
index d18893ee108..f681bf819f0 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
@@ -133,7 +133,6 @@ public class ModelContextImpl implements ModelContext {
         private final boolean isFirstTimeDeployment;
         private final boolean useDedicatedNodeForLogserver;
         private final boolean useAdaptiveDispatch;
-        private final boolean dispatchWithProtobuf;
         private final Optional<TlsSecrets> tlsSecrets;
         private final double defaultTermwiseLimit;
 
@@ -165,8 +164,6 @@ public class ModelContextImpl implements ModelContext {
             this.isFirstTimeDeployment = isFirstTimeDeployment;
             this.useDedicatedNodeForLogserver = Flags.USE_DEDICATED_NODE_FOR_LOGSERVER.bindTo(flagSource)
                     .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
-            this.dispatchWithProtobuf = Flags.DISPATCH_WITH_PROTOBUF.bindTo(flagSource)
-                    .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             this.useAdaptiveDispatch = Flags.USE_ADAPTIVE_DISPATCH.bindTo(flagSource)
                     .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value();
             this.tlsSecrets = tlsSecrets;
@@ -221,7 +218,7 @@ public class ModelContextImpl implements ModelContext {
         public boolean useFdispatchByDefault() { return false; }
 
         @Override
-        public boolean dispatchWithProtobuf() { return dispatchWithProtobuf; }
+        public boolean dispatchWithProtobuf() { return true; }
 
         @Override
         public boolean useAdaptiveDispatch() { return useAdaptiveDispatch; }