MAGETWO-37614: Stabilize story

Author: Michael Logvin

app/code/Magento/Customer/Model/Resource/Customer.php

@@ -202,21 +202,15 @@ protected function _saveAddresses(\Magento\Customer\Model\Customer $customer)
                 }
             }
         }
-        //@TODO: find appropriate place
         $changedAddresses = [];
-        if ($defaultBillingId != $customer->getData('default_billing')) {
-            $changedAddresses['default_billing'] = $customer->getData('default_billing');
-        }
-        if ($defaultShippingId != $customer->getData('default_shipping')) {
-            $changedAddresses['default_shipping'] = $customer->getData('default_shipping');
-        }
-        if ($changedAddresses) {
-            $this->_getWriteAdapter()->update(
-                $this->getTable('customer_entity'),
-                $changedAddresses,
-                $this->_getWriteAdapter()->quoteInto('entity_id = ?', $customer->getId())
-            );
-        }
+
+        $changedAddresses['default_billing'] = $customer->getData('default_billing');
+        $changedAddresses['default_shipping'] = $customer->getData('default_shipping');
+        $this->_getWriteAdapter()->update(
+            $this->getTable('customer_entity'),
+            $changedAddresses,
+            $this->_getWriteAdapter()->quoteInto('entity_id = ?', $customer->getId())
+        );
 
         return $this;
     }