Revert "Revert "Enable Java dispatch by default""

1 files changed, 2 insertions, 2 deletions

diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
index 3d82be9b65d..f2955e60f48 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -82,7 +82,7 @@ public class Flags {
             NODE_TYPE, APPLICATION_ID, HOSTNAME);
 
     public static final UnboundBooleanFlag USE_FDISPATCH_BY_DEFAULT = defineFeatureFlag(
-            "use-fdispatch-by-default", true,
+            "use-fdispatch-by-default", false,
             "Should fdispatch be used as the default instead of the java dispatcher",
             "Takes effect at redeployment",
             APPLICATION_ID);
@@ -94,7 +94,7 @@ public class Flags {
             APPLICATION_ID);
 
     public static final UnboundBooleanFlag DISPATCH_WITH_PROTOBUF = defineFeatureFlag(
-            "dispatch-with-protobuf", false,
+            "dispatch-with-protobuf", true,
             "Should the java dispatcher use protobuf/jrt as the default",
             "Takes effect at redeployment",
             APPLICATION_ID);