diff --git a/base/src/com/google/idea/blaze/base/ext/IntelliJExtManager.java b/base/src/com/google/idea/blaze/base/ext/IntelliJExtManager.java
index 2318292ef7d..c9bd6790456 100644
--- a/base/src/com/google/idea/blaze/base/ext/IntelliJExtManager.java
+++ b/base/src/com/google/idea/blaze/base/ext/IntelliJExtManager.java
@@ -47,7 +47,7 @@ public class IntelliJExtManager {
    * Controls whether the intellij-ext binary is used at all. Ignored if EXPERIMENT_SERVICE_PROPERTY
    * is set.
    */
-  private static final BoolExperiment ENABLED = new BoolExperiment("use.intellij.ext", false);
+  private static final BoolExperiment ENABLED = new BoolExperiment("use.intellij.ext", true);
 
   private static final BoolExperiment ISSUETRACKER =
       new BoolExperiment("use.intellij.ext.issuetracker", false);
@@ -66,6 +66,9 @@ public class IntelliJExtManager {
   private static final BoolExperiment FILEAPI =
       new BoolExperiment("use.intellij.ext.fileapi", false);
 
+  private static final BoolExperiment ECATCHER =
+      new BoolExperiment("use.intellij.ext.ecatcher", false);
+
   private static final BoolExperiment BUILD_SERVICE =
       new BoolExperiment("use.intellij.ext.buildservice", false);
 
@@ -189,6 +192,10 @@ public boolean isFileApiEnabled() {
     return isEnabled() && FILEAPI.getValue();
   }
 
+  public boolean isECatcherEnabled() {
+    return isEnabled() && ECATCHER.getValue();
+  }
+
   public boolean isBuildServiceEnabled() {
     return isEnabled() && BUILD_SERVICE.getValue();
   }
diff --git a/ext/src/com/google/idea/blaze/ext/IntelliJExtClient.java b/ext/src/com/google/idea/blaze/ext/IntelliJExtClient.java
index 36d587c68e2..d55a36cb35e 100644
--- a/ext/src/com/google/idea/blaze/ext/IntelliJExtClient.java
+++ b/ext/src/com/google/idea/blaze/ext/IntelliJExtClient.java
@@ -22,6 +22,7 @@
 import com.google.idea.blaze.ext.CodeSearchGrpc.CodeSearchFutureStub;
 import com.google.idea.blaze.ext.CritiqueServiceGrpc.CritiqueServiceBlockingStub;
 import com.google.idea.blaze.ext.DepServerGrpc.DepServerFutureStub;
+import com.google.idea.blaze.ext.ECatcherServiceGrpc.ECatcherServiceFutureStub;
 import com.google.idea.blaze.ext.ExperimentsServiceGrpc.ExperimentsServiceBlockingStub;
 import com.google.idea.blaze.ext.FileApiGrpc.FileApiFutureStub;
 import com.google.idea.blaze.ext.FindingsServiceGrpc.FindingsServiceBlockingStub;
@@ -134,6 +135,10 @@ public CodeSearchFutureStub getCodeSearchService() {
     return CodeSearchGrpc.newFutureStub(channel);
   }
 
+  public ECatcherServiceFutureStub getECatcherService() {
+    return ECatcherServiceGrpc.newFutureStub(channel);
+  }
+
   public PiperServiceFutureStub getPiperService() {
     return PiperServiceGrpc.newFutureStub(channel);
   }
diff --git a/ext/src/com/google/idea/blaze/ext/IntelliJExtService.java b/ext/src/com/google/idea/blaze/ext/IntelliJExtService.java
index 7e4f139ca46..bed8fdf0479 100644
--- a/ext/src/com/google/idea/blaze/ext/IntelliJExtService.java
+++ b/ext/src/com/google/idea/blaze/ext/IntelliJExtService.java
@@ -23,6 +23,7 @@
 import com.google.idea.blaze.ext.CodeSearchGrpc.CodeSearchFutureStub;
 import com.google.idea.blaze.ext.CritiqueServiceGrpc.CritiqueServiceBlockingStub;
 import com.google.idea.blaze.ext.DepServerGrpc.DepServerFutureStub;
+import com.google.idea.blaze.ext.ECatcherServiceGrpc.ECatcherServiceFutureStub;
 import com.google.idea.blaze.ext.ExperimentsServiceGrpc.ExperimentsServiceBlockingStub;
 import com.google.idea.blaze.ext.FileApiGrpc.FileApiFutureStub;
 import com.google.idea.blaze.ext.FindingsServiceGrpc.FindingsServiceBlockingStub;
@@ -213,6 +214,11 @@ public CodeSearchFutureStub getCodeSearchService() throws IOException {
     return client.getCodeSearchService();
   }
 
+  public ECatcherServiceFutureStub getECatcherService() throws IOException {
+    IntelliJExtBlockingStub unused = connect();
+    return client.getECatcherService();
+  }
+
   public FileApiFutureStub getFileApiService() throws IOException {
     IntelliJExtBlockingStub unused = connect();
     return client.getFileApiService();