diff --git a/java/com/googlesource/gerrit/plugins/supermanifest/RepoUpdater.java b/java/com/googlesource/gerrit/plugins/supermanifest/RepoUpdater.java
index 8edc7ba..89e2886 100644
--- a/java/com/googlesource/gerrit/plugins/supermanifest/RepoUpdater.java
+++ b/java/com/googlesource/gerrit/plugins/supermanifest/RepoUpdater.java
@@ -20,7 +20,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URI;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.gitrepo.ManifestParser;
 import org.eclipse.jgit.gitrepo.RepoCommand;
@@ -30,7 +29,7 @@
 class RepoUpdater implements SubModuleUpdater {
   PersonIdent serverIdent;
 
-  public RepoUpdater(PersonIdent serverIdent, URI canonicalWebUrl) {
+  public RepoUpdater(PersonIdent serverIdent) {
     this.serverIdent = serverIdent;
   }
 
diff --git a/java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestRefUpdatedListener.java b/java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestRefUpdatedListener.java
index d202b71..a8848ef 100644
--- a/java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestRefUpdatedListener.java
+++ b/java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestRefUpdatedListener.java
@@ -315,7 +315,7 @@
     SubModuleUpdater subModuleUpdater;
     switch (c.getToolType()) {
       case Repo:
-        subModuleUpdater = new RepoUpdater(serverIdent.get(), canonicalWebUrl);
+        subModuleUpdater = new RepoUpdater(serverIdent.get());
         break;
       case Jiri:
         subModuleUpdater = new JiriUpdater(serverIdent.get(), canonicalWebUrl, downloadScheme);
