ACP2E-1378, refactored solution by disabling old plugin

Author: aplapana

app/code/Magento/Store/App/FrontController/Plugin/DefaultStore.php

@@ -66,8 +66,8 @@ public function beforeDispatch(
         \Magento\Framework\App\FrontController $subject,
         \Magento\Framework\App\RequestInterface $request
     ) {
-        $reader = $this->readerList->getReader($this->runMode);
+/*        $reader = $this->readerList->getReader($this->runMode);
         $defaultStoreId = $reader->getDefaultStoreId($this->scopeCode);
-        $this->storeManager->setCurrentStore($defaultStoreId);
+        $this->storeManager->setCurrentStore($defaultStoreId);*/
     }
 }

app/code/Magento/Store/etc/adminhtml/di.xml

@@ -6,9 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Framework\App\FrontControllerInterface">
-        <plugin name="default_store_setter" type="Magento\Store\App\FrontController\Plugin\DefaultStore" />
-    </type>
     <type name="Magento\Framework\Notification\MessageList">
         <arguments>
             <argument name="messages" xsi:type="array">

app/code/Magento/Store/etc/di.xml

@@ -115,12 +115,6 @@
             <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
         </arguments>
     </type>
-    <type name="Magento\Store\App\FrontController\Plugin\DefaultStore">
-        <arguments>
-            <argument name="runMode" xsi:type="init_parameter">Magento\Store\Model\StoreManager::PARAM_RUN_TYPE</argument>
-            <argument name="scopeCode" xsi:type="init_parameter">Magento\Store\Model\StoreManager::PARAM_RUN_CODE</argument>
-        </arguments>
-    </type>
     <virtualType name="Magento\Store\Model\ResourceModel\Group\Collection\FetchStrategy" type="Magento\Framework\Data\Collection\Db\FetchStrategy\Cache">
         <arguments>
             <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Collection</argument>