edlp_d8/sites/all/modules/contrib/admin/domain_site_settings/domain_site_settings-circular_dependency-2930391-7.patch

diff --git a/domain_site_settings.services.yml b/domain_site_settings.services.yml
index 65e9113..6ebd87d 100644
--- a/domain_site_settings.services.yml
+++ b/domain_site_settings.services.yml
@@ -1,6 +1,6 @@
 services:
   domain_site_settings.overrider:
     class: \Drupal\domain_site_settings\Configuration\DomainConfigOverride
-    arguments: ['@domain.negotiator', '@config.factory']
+    arguments: ['@config.factory']
     tags:
       - {name: config.factory.override, priority: 5}
diff --git a/src/Configuration/DomainConfigOverride.php b/src/Configuration/DomainConfigOverride.php
index b2571b4..506feef 100644
--- a/src/Configuration/DomainConfigOverride.php
+++ b/src/Configuration/DomainConfigOverride.php
@@ -16,13 +16,6 @@ use Drupal\Core\Config\ConfigFactoryInterface;
  */
 class DomainConfigOverride implements ConfigFactoryOverrideInterface {
 
-  /**
-   * The Domain negotiator.
-   *
-   * @var \Drupal\domain\DomainNegotiatorInterface
-   */
-  protected $negotiator;
-
   /**
    * The config factory.
    *
@@ -33,16 +26,11 @@ class DomainConfigOverride implements ConfigFactoryOverrideInterface {
   /**
    * Constructs a DomainSourcePathProcessor object.
    *
-   *   The domain loader.
-   * @param \Drupal\domain\DomainNegotiatorInterface $negotiator
-   *   The domain negotiator.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The module handler service.
    */
   public function __construct(
-      DomainNegotiatorInterface $negotiator,
       ConfigFactoryInterface $config_factory) {
-    $this->negotiator = $negotiator;
     $this->configFactory = $config_factory;
   }
 
@@ -59,7 +47,9 @@ class DomainConfigOverride implements ConfigFactoryOverrideInterface {
   public function loadOverrides($names) {
     $overrides = array();
     if (in_array('system.site', $names)) {
-      $domain = $this->negotiator->getActiveDomain();
+      /* @var \Drupal\domain\DomainNegotiator $negotiator */
+      $negotiator = \Drupal::service('domain.negotiator');
+      $domain = $negotiator->getActiveDomain();
       if (!empty($domain)) {
         $domain_key = $domain->id();
         $configFactory = $this->configFactory->get('domain_site_settings.domainconfigsettings');