1 files changed, 6 insertions, 6 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java
index 73e7b36c381..96324ea4320 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java
@@ -7,9 +7,10 @@ import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.path.Path;
 import com.yahoo.transaction.Transaction;
-import com.yahoo.vespa.config.server.TimeoutBudget;
 import com.yahoo.vespa.config.server.application.TenantApplications;
 
+import static com.yahoo.vespa.curator.Curator.CompletionWaiter;
+
 /**
  * A LocalSession is a session that has been created locally on this configserver. A local session can be edited and
  * prepared. Deleting a local session will ensure that the local filesystem state and global zookeeper state is
@@ -56,8 +57,11 @@ public class LocalSession extends Session {
         sessionZooKeeperClient.writeStatus(newStatus);
     }
 
+    public CompletionWaiter createActiveWaiter() {
+        return sessionZooKeeperClient.createActiveWaiter();
+    }
+
     public Transaction createActivateTransaction() {
-        sessionZooKeeperClient.createActiveWaiter();
         Transaction transaction = createSetStatusTransaction(Status.ACTIVATE);
         transaction.add(applicationRepo.createPutTransaction(sessionZooKeeperClient.readApplicationId(), getSessionId()).operations());
         return transaction;
@@ -71,10 +75,6 @@ public class LocalSession extends Session {
         return applicationPackage.getMetaData().getPreviousActiveGeneration();
     }
 
-    public void waitUntilActivated(TimeoutBudget timeoutBudget) {
-        sessionZooKeeperClient.getActiveWaiter().awaitCompletion(timeoutBudget.timeLeft());
-    }
-
     public enum Mode {
         READ, WRITE
     }