MAGETWO-98377: New customer created from admin for non default store view receives Welcome Email from default store view

Revert "Small refactoring"

This reverts commit 3b84172.

Author: Raoul Rego

app/code/Magento/Newsletter/Model/Plugin/CustomerPlugin.php

@@ -164,11 +164,12 @@ public function afterDelete(CustomerRepository $subject, $result, CustomerInterf
     public function afterGetById(CustomerRepository $subject, CustomerInterface $customer)
     {
         $extensionAttributes = $customer->getExtensionAttributes();
-        $storeId = $this->storeManager->getStore()->getId();
-        $customer->setStoreId($storeId);
+
         if ($extensionAttributes === null) {
             /** @var CustomerExtensionInterface $extensionAttributes */
             $extensionAttributes = $this->extensionFactory->create(CustomerInterface::class);
+            $storeId = $this->storeManager->getStore()->getId();
+            $customer->setStoreId($storeId);
             $customer->setExtensionAttributes($extensionAttributes);
         }
         if ($extensionAttributes->getIsSubscribed() === null) {