diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/UrlRewriter.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/UrlRewriter.java
index a814559..d52a3f5 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/UrlRewriter.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/UrlRewriter.java
@@ -55,12 +55,10 @@
 
   private final UrlRewriterConfig config;
   private final Function<URL, List<URL>> rewriter;
-  private final Consumer<String> log;
 
   @VisibleForTesting
   UrlRewriter(Consumer<String> log, String filePathForErrorReporting, Reader reader)
       throws UrlRewriterParseException {
-    this.log = Preconditions.checkNotNull(log);
     Preconditions.checkNotNull(reader, "UrlRewriterConfig source must be set");
     this.config = new UrlRewriterConfig(filePathForErrorReporting, reader);
 
@@ -102,10 +100,6 @@
     ImmutableList<URL> rewritten =
         urls.stream().map(rewriter).flatMap(Collection::stream).collect(toImmutableList());
 
-    if (!urls.equals(rewritten)) {
-      log.accept(String.format("Rewritten %s as %s", urls, rewritten));
-    }
-
     return rewritten;
   }
 
