diff --git a/src/main/java/com/google/gerrit/git/PushAllProjectsOp.java b/src/main/java/com/google/gerrit/git/PushAllProjectsOp.java
index ebfd3e159e..4e8b849aa9 100644
--- a/src/main/java/com/google/gerrit/git/PushAllProjectsOp.java
+++ b/src/main/java/com/google/gerrit/git/PushAllProjectsOp.java
@@ -19,6 +19,7 @@ import com.google.gerrit.client.reviewdb.Project;
 import com.google.gerrit.client.reviewdb.ProjectRight;
 import com.google.gerrit.client.reviewdb.ReviewDb;
 import com.google.gerrit.client.rpc.Common;
+import com.google.gerrit.server.GerritServer;
 import com.google.gwtorm.client.OrmException;
 
 import org.slf4j.Logger;
@@ -30,20 +31,22 @@ public class PushAllProjectsOp implements Runnable {
   private static final Logger log =
       LoggerFactory.getLogger(PushAllProjectsOp.class);
 
+  private final GerritServer server;
   private final String urlMatch;
 
-  public PushAllProjectsOp() {
-    this(null);
+  public PushAllProjectsOp(final GerritServer gs) {
+    this(gs, null);
   }
 
-  public PushAllProjectsOp(final String urlMatch) {
+  public PushAllProjectsOp(final GerritServer gs, final String urlMatch) {
+    this.server = gs;
     this.urlMatch = urlMatch;
   }
 
   public void run() {
     final HashSet<Branch.NameKey> pending = new HashSet<Branch.NameKey>();
     try {
-      final ReviewDb db = Common.getSchemaFactory().open();
+      final ReviewDb db = server.getSchemaFactory().open();
       try {
         for (final Project project : db.projects().all()) {
           if (!ProjectRight.WILD_PROJECT.equals(project.getId())) {
diff --git a/src/main/java/com/google/gerrit/pgm/CreateSchema.java b/src/main/java/com/google/gerrit/pgm/CreateSchema.java
index cd35d2105c..ee4dbcf4da 100644
--- a/src/main/java/com/google/gerrit/pgm/CreateSchema.java
+++ b/src/main/java/com/google/gerrit/pgm/CreateSchema.java
@@ -14,7 +14,6 @@
 
 package com.google.gerrit.pgm;
 
-import com.google.gerrit.client.rpc.Common;
 import com.google.gerrit.server.GerritServer;
 
 /**
@@ -23,8 +22,8 @@ import com.google.gerrit.server.GerritServer;
 public class CreateSchema extends AbstractProgram {
   @Override
   public int run() throws Exception {
-    GerritServer.getInstance(false);
-    Common.getSchemaFactory().open().close();
+    final GerritServer gs = GerritServer.getInstance(false);
+    gs.getSchemaFactory().open().close();
     System.out.println("Gerrit2 schema initialized");
     return 0;
   }
diff --git a/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java b/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java
index bc2593ebdd..908cc080b2 100644
--- a/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java
+++ b/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java
@@ -18,7 +18,6 @@ import com.google.gerrit.client.reviewdb.Change;
 import com.google.gerrit.client.reviewdb.PatchSet;
 import com.google.gerrit.client.reviewdb.Project;
 import com.google.gerrit.client.reviewdb.ReviewDb;
-import com.google.gerrit.client.rpc.Common;
 import com.google.gerrit.git.PatchSetImporter;
 import com.google.gerrit.server.GerritServer;
 import com.google.gwtorm.client.OrmException;
@@ -63,7 +62,7 @@ public class ReimportPatchSets extends AbstractProgram {
     }
 
     int exitStatus = 0;
-    final ReviewDb db = Common.getSchemaFactory().open();
+    final ReviewDb db = gs.getSchemaFactory().open();
     final ProgressMonitor pm = new TextProgressMonitor();
     try {
       pm.start(1);
diff --git a/src/main/java/com/google/gerrit/server/EncryptedContactStore.java b/src/main/java/com/google/gerrit/server/EncryptedContactStore.java
index 9ebcee743a..429ff4bbcb 100644
--- a/src/main/java/com/google/gerrit/server/EncryptedContactStore.java
+++ b/src/main/java/com/google/gerrit/server/EncryptedContactStore.java
@@ -18,7 +18,6 @@ import com.google.gerrit.client.reviewdb.Account;
 import com.google.gerrit.client.reviewdb.AccountExternalId;
 import com.google.gerrit.client.reviewdb.ContactInformation;
 import com.google.gerrit.client.reviewdb.ReviewDb;
-import com.google.gerrit.client.rpc.Common;
 import com.google.gerrit.client.rpc.ContactInformationStoreException;
 import com.google.gwtorm.client.OrmException;
 
@@ -73,6 +72,7 @@ public class EncryptedContactStore implements ContactStore {
     }
   }
 
+  private final GerritServer server;
   private PGPPublicKey dest;
   private SecureRandom prng;
   private URL storeUrl;
@@ -80,6 +80,8 @@ public class EncryptedContactStore implements ContactStore {
 
   private EncryptedContactStore(final GerritServer gs)
       throws ContactInformationStoreException {
+    server = gs;
+
     if (gs.getContactStoreURL() == null) {
       throw new ContactInformationStoreException(new IllegalStateException(
           "No contactStoreURL configured"));
@@ -229,7 +231,7 @@ public class EncryptedContactStore implements ContactStore {
     return buf.toByteArray();
   }
 
-  private static String format(final Account account,
+  private String format(final Account account,
       final ContactInformation info) throws ContactInformationStoreException {
     Timestamp on = account.getContactFiledOn();
     if (on == null) {
@@ -246,7 +248,7 @@ public class EncryptedContactStore implements ContactStore {
     field(b, "Preferred-Email", account.getPreferredEmail());
 
     try {
-      final ReviewDb db = Common.getSchemaFactory().open();
+      final ReviewDb db = server.getSchemaFactory().open();
       try {
         for (final AccountExternalId e : db.accountExternalIds().byAccount(
             account.getId())) {
diff --git a/src/main/java/com/google/gerrit/server/GerritServer.java b/src/main/java/com/google/gerrit/server/GerritServer.java
index cdaaca9d1a..497fec5a4d 100644
--- a/src/main/java/com/google/gerrit/server/GerritServer.java
+++ b/src/main/java/com/google/gerrit/server/GerritServer.java
@@ -153,7 +153,7 @@ public class GerritServer {
         if (startQueues) {
           impl.reloadSubmitQueue();
           if (PushQueue.isReplicationEnabled()) {
-            WorkQueue.schedule(new PushAllProjectsOp(), 30, TimeUnit.SECONDS);
+            WorkQueue.schedule(new PushAllProjectsOp(impl), 30, TimeUnit.SECONDS);
           }
         }
       } catch (OrmException e) {
diff --git a/src/main/java/com/google/gerrit/server/OpenIdServiceImpl.java b/src/main/java/com/google/gerrit/server/OpenIdServiceImpl.java
index fd2e857925..458533b30e 100644
--- a/src/main/java/com/google/gerrit/server/OpenIdServiceImpl.java
+++ b/src/main/java/com/google/gerrit/server/OpenIdServiceImpl.java
@@ -175,7 +175,7 @@ class OpenIdServiceImpl implements OpenIdService {
     // We might already have this account on file. Look for it.
     //
     try {
-      final ReviewDb db = Common.getSchemaFactory().open();
+      final ReviewDb db = server.getSchemaFactory().open();
       try {
         final ResultSet<AccountExternalId> ae =
             db.accountExternalIds().byExternal(aReq.getIdentity());
@@ -329,7 +329,7 @@ class OpenIdServiceImpl implements OpenIdService {
     Account account = null;
     if (user != null) {
       try {
-        final ReviewDb d = Common.getSchemaFactory().open();
+        final ReviewDb d = server.getSchemaFactory().open();
         try {
           switch (mode) {
             case SIGN_IN:
diff --git a/src/main/java/com/google/gerrit/server/ssh/AdminReplicate.java b/src/main/java/com/google/gerrit/server/ssh/AdminReplicate.java
index 9fe2de52f5..a513bd915a 100644
--- a/src/main/java/com/google/gerrit/server/ssh/AdminReplicate.java
+++ b/src/main/java/com/google/gerrit/server/ssh/AdminReplicate.java
@@ -51,7 +51,8 @@ class AdminReplicate extends AbstractCommand {
     }
 
     if (all) {
-      WorkQueue.schedule(new PushAllProjectsOp(urlMatch), 0, TimeUnit.SECONDS);
+      WorkQueue.schedule(new PushAllProjectsOp(getGerritServer(), urlMatch), 0,
+          TimeUnit.SECONDS);
 
     } else {
       for (final String name : projectNames) {