Reversed change

Author: Barny Shergold

app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php

@@ -73,7 +73,10 @@ public function getUrlPath($category, $parentCategory = null)
         if (in_array($category->getParentId(), [Category::ROOT_CATEGORY_ID, Category::TREE_ROOT_ID])) {
             return '';
         }
-
+        $path = $category->getUrlPath();
+        if ($path !== null && !$category->dataHasChangedFor('url_key') && !$category->dataHasChangedFor('parent_id')) {
+            return $path;
+        }
         $path = $category->getUrlKey();
         if ($path === false) {
             return $category->getUrlPath();