diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java
index 5e857908cd..016f69e119 100644
--- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java
+++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java
@@ -74,7 +74,8 @@ public class LuceneIndexModule extends LifecycleModule {
 
     install(new IndexModule(threads));
     if (singleVersions == null) {
-      install(new MultiVersionModule());
+      bind(AbstractVersionManager.class).to(LuceneVersionManager.class);
+      listener().to(LuceneVersionManager.class);
     } else {
       install(new SingleVersionModule(singleVersions));
     }
@@ -87,12 +88,4 @@ public class LuceneIndexModule extends LifecycleModule {
         cfg.getInt("index", "maxTerms", BooleanQuery.getMaxClauseCount()));
     return IndexConfig.fromConfig(cfg);
   }
-
-  private static class MultiVersionModule extends LifecycleModule {
-    @Override
-    public void configure() {
-      bind(AbstractVersionManager.class).to(LuceneVersionManager.class);
-      listener().to(LuceneVersionManager.class);
-    }
-  }
 }