Revert "Merge pull request #15739 from vespa-engine/revert-15734-bratseth/simplify-config-take-2"

This reverts commit d1e33a9420805f5d416ca55ed79497fd28f20216, reversing
changes made to 10464c859ccca2596e2b841612f8ea958330e4dc.

1 files changed, 1 insertions, 5 deletions

diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
index 3158c06b0b1..f32d7dfbb02 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
@@ -261,16 +261,12 @@ public final class ConfiguredApplication implements Application {
 
     private void startReconfigurerThread() {
         reconfigurerThread = new Thread(() -> {
-            boolean restartOnDeploy = false;
             while ( ! Thread.interrupted()) {
                 try {
                     ContainerBuilder builder = createBuilderWithGuiceBindings();
 
-                    // Restart on deploy is sticky: Once it is set no future generation should be applied until restart
-                    restartOnDeploy = restartOnDeploy || qrConfig.restartOnDeploy();
-
                     // Block until new config arrives, and it should be applied
-                    configurer.getNewComponentGraph(builder.guiceModules().activate(), restartOnDeploy);
+                    configurer.getNewComponentGraph(builder.guiceModules().activate());
                     initializeAndActivateContainer(builder);
                 } catch (ConfigInterruptedException e) {
                     break;