diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilderImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilderImpl.java
index d4d0cdd8de..8c0df10f04 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilderImpl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilderImpl.java
@@ -192,7 +192,7 @@ public class ChangeRebuilderImpl extends ChangeRebuilder {
     deleteRef(change, changeMetaRepo, manager.getChangeRepo().cmds);
 
     for (PatchSet ps : bundle.getPatchSets()) {
-      events.add(new PatchSetEvent(change, ps, manager.getCodeRepo().rw));
+      events.add(new PatchSetEvent(change, ps, manager.getChangeRepo().rw));
       for (PatchLineComment c : getPatchLineComments(bundle, ps)) {
         PatchLineCommentEvent e =
             new PatchLineCommentEvent(c, change, ps, patchListCache);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java
index 0f10b44331..8344fedac1 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java
@@ -104,7 +104,6 @@ public class NoteDbUpdateManager {
   private final ListMultimap<String, ChangeUpdate> changeUpdates;
   private final ListMultimap<String, ChangeDraftUpdate> draftUpdates;
 
-  private OpenRepo codeRepo;
   private OpenRepo changeRepo;
   private OpenRepo allUsersRepo;
   private Map<Change.Id, NoteDbChangeState.Delta> staged;
@@ -131,12 +130,6 @@ public class NoteDbUpdateManager {
     return this;
   }
 
-  public NoteDbUpdateManager setCodeRepo(Repository repo, RevWalk rw) {
-    checkState(codeRepo == null, "code repo already initialized");
-    codeRepo = new OpenRepo(repo, rw, null, null, false);
-    return this;
-  }
-
   public NoteDbUpdateManager setAllUsersRepo(Repository repo, RevWalk rw,
       ObjectInserter ins, ChainedReceiveCommands cmds) {
     checkState(allUsersRepo == null, "All-Users repo already initialized");
@@ -149,22 +142,11 @@ public class NoteDbUpdateManager {
     return changeRepo;
   }
 
-  OpenRepo getCodeRepo() throws IOException {
-    initCodeRepo();
-    return codeRepo;
-  }
-
   OpenRepo getAllUsersRepo() throws IOException {
     initAllUsersRepo();
     return allUsersRepo;
   }
 
-  private void initCodeRepo() throws IOException {
-    if (codeRepo == null) {
-      codeRepo = openRepo(projectName);
-    }
-  }
-
   private void initChangeRepo() throws IOException {
     if (changeRepo == null) {
       changeRepo = openRepo(projectName);