Revert "ACPT-1599: Fixing DeploymentConfig resets & reloads every time new key that wasn't previously set"

This reverts commit a731903ceab6881ca09875eb434a7bc4c5568f9d.

This workaround didn't work for very specific use-case of custom 'etc' path when running setup:upgrade.  This was found in setup-integration tests.  The reason why it didn't work is because the first DeploymentConfig doesn't use the custom paths for 'etc', so it was loading the wrong files.  This problem may still exist for plugins and other objects that use the original ObjectManager's DeploymentConfig instead of the DeploymentConfig object created by Laminas ServiceManager.

Author: JacobBrownAustin

setup/src/Magento/Setup/Console/CommandList.php

@@ -6,8 +6,6 @@
 
 namespace Magento\Setup\Console;
 
-use Magento\Framework\App\DeploymentConfig;
-use Magento\Framework\App\ObjectManager;
 use Magento\Setup\Console\Command\TablesWhitelistGenerateCommand;
 use Laminas\ServiceManager\ServiceManager;
 
@@ -18,20 +16,21 @@
  */
 class CommandList
 {
+    /**
+     * Service Manager
+     *
+     * @var ServiceManager
+     */
+    private $serviceManager;
+
     /**
      * Constructor
      *
      * @param ServiceManager $serviceManager
-     * @param DeploymentConfig|null $deploymentConfig
      */
-    public function __construct(
-        private ServiceManager $serviceManager,
-        ?DeploymentConfig $deploymentConfig = null
-    ) {
-        $deploymentConfig ??= ObjectManager::getInstance()->get(DeploymentConfig::class);
-        /* Note: We must use same DeploymentConfig object in objects created by Laminas' ServiceManager, because
-         * some commands alter deployment configuration. */
-        $this->serviceManager->setService(DeploymentConfig::class, $deploymentConfig);
+    public function __construct(ServiceManager $serviceManager)
+    {
+        $this->serviceManager = $serviceManager;
     }
 
     /**