diff --git a/container-images/gerrit-init/tools/gerrit_init.py b/container-images/gerrit-init/tools/gerrit_init.py
index 538c9a9..f598d55 100755
--- a/container-images/gerrit-init/tools/gerrit_init.py
+++ b/container-images/gerrit-init/tools/gerrit_init.py
@@ -35,7 +35,6 @@
         self.plugin_installer = get_installer(self.site, self.config)
 
         self.gerrit_config = self._parse_gerrit_config()
-        self.is_replica = self._is_replica()
         self.installed_plugins = self._get_installed_plugins()
 
     def _parse_gerrit_config(self):
@@ -46,12 +45,6 @@
 
         return None
 
-    def _is_replica(self):
-        if self.gerrit_config:
-            return self.gerrit_config.get_boolean("container.replica", False)
-
-        return False
-
     def _get_gerrit_version(self, gerrit_war_path):
         command = "java -jar %s version" % gerrit_war_path
         version_process = subprocess.run(command.split(), stdout=subprocess.PIPE)
@@ -124,9 +117,6 @@
 
         flags = "--no-auto-start --batch"
 
-        if self.is_replica:
-            flags += " --no-reindex"
-
         command = "java -jar /var/war/gerrit.war init %s %s -d %s" % (
             flags,
             plugin_options,
