diff --git a/lib/internal/Magento/Framework/Test/Unit/UrlTest.php b/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
index 8399a962594c007bcc5e69fd05191c4fb9c01b83..abcb31a5b4f79322cb515d9bb3c5c9576b7d099a 100644
--- a/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
@@ -69,6 +69,12 @@ class UrlTest extends \PHPUnit_Framework_TestCase
             false
         );
 
+        $escaperMock = $this->getMock(\Magento\Framework\ZendEscaper::class, [], [], '', false);
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $objectManager->setBackwardCompatibleProperty($this->routeParamsResolverMock, 'escaper', $escaperMock);
+
         $this->routeParamsPreprocessorMock = $this->getMockForAbstractClass(
             'Magento\Framework\Url\RouteParamsPreprocessorInterface',
             [],
diff --git a/lib/internal/Magento/Framework/Url.php b/lib/internal/Magento/Framework/Url.php
index 1a3293cffc489868e50afdcc9240452c5097184d..f1edf827ed505dc73575ae5e1cb5563575b8cbf2 100644
--- a/lib/internal/Magento/Framework/Url.php
+++ b/lib/internal/Magento/Framework/Url.php
@@ -1008,25 +1008,6 @@ class Url extends \Magento\Framework\DataObject implements \Magento\Framework\Ur
 
         $query = $this->_getQuery();
         if ($query) {
-            $queryParams = explode('&', $query);
-            foreach ($queryParams as $key => $value) {
-//                $parts = explode('=', $value);
-//                if (count($parts) == 1) {
-//                    $queryParams[$key] = $this->getEscaper()->escapeUrl($value);
-//                } else {
-//                    $value = implode(
-//                        '=',
-//                        [
-//                            $this->getEscaper()->escapeUrl($parts[0]),
-//                            $this->getEscaper()->escapeUrl($parts[1])
-//                        ]
-//                    );
-//                    unset($queryParams[$key]);
-//                    $queryParams[$key] = $value;
-//                }
-            }
-            $query = implode('&', $queryParams);
-            $this->addQueryParams($query, !empty($routeParams['_current']));
             $url .= '?' . $query;
         }
 
diff --git a/lib/internal/Magento/Framework/Url/RouteParamsResolver.php b/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
index e312601d52fc7cd05b89e063c582f34fab5efb61..d3493f19c2eab1570258b4f97dd9e6628858bc1f 100644
--- a/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
+++ b/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
@@ -34,7 +34,7 @@ class RouteParamsResolver extends \Magento\Framework\DataObject implements Route
     /**
      * @var \Magento\Framework\ZendEscaper
      */
-    private $escaper;
+    protected $escaper;
 
     /**
      * @param \Magento\Framework\App\RequestInterface $request
@@ -156,7 +156,7 @@ class RouteParamsResolver extends \Magento\Framework\DataObject implements Route
 
     /**
      * @param void
-     * @return Escaper
+     * @return \Magento\Framework\ZendEscaper
      */
     private function getEscaper()
     {