diff --git a/core/modules/update/src/Form/UpdateManagerInstall.php b/core/modules/update/src/Form/UpdateManagerInstall.php
index 3198a28..b6f1855 100644
--- a/core/modules/update/src/Form/UpdateManagerInstall.php
+++ b/core/modules/update/src/Form/UpdateManagerInstall.php
@@ -12,6 +12,7 @@
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Updater\Updater;
+use Drupal\Core\Url;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -216,8 +217,9 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     // whatever FileTransfer object authorize.php creates for us.
     else {
       system_authorized_init('update_authorize_run_install', drupal_get_path('module', 'update') . '/update.authorize.inc', $arguments, $this->t('Update manager'));
-      $form_state->setRedirectUrl(system_authorized_get_url());
     }
+    $redirect_url = Url::fromUri('base://core/authorize.php');
+    $form_state->setRedirectUrl($redirect_url);
   }
 
 }
diff --git a/core/modules/update/src/Form/UpdateReady.php b/core/modules/update/src/Form/UpdateReady.php
index 7f4c5da..c6de99c 100644
--- a/core/modules/update/src/Form/UpdateReady.php
+++ b/core/modules/update/src/Form/UpdateReady.php
@@ -13,6 +13,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\State\StateInterface;
 use Drupal\Core\Updater\Updater;
+use Drupal\Core\Url;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -141,8 +142,9 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
       // whatever FileTransfer object authorize.php creates for us.
       else {
         system_authorized_init('update_authorize_run_update', drupal_get_path('module', 'update') . '/update.authorize.inc', array($updates), $this->t('Update manager'));
-        $form_state->setRedirectUrl(system_authorized_get_url());
       }
+      $redirect_url = Url::fromUri('base://core/authorize.php');
+      $form_state->setRedirectUrl($redirect_url);
     }
   }
 
diff --git a/core/modules/update/update.authorize.inc b/core/modules/update/update.authorize.inc
index 8709e56..bd37cc9 100644
--- a/core/modules/update/update.authorize.inc
+++ b/core/modules/update/update.authorize.inc
@@ -51,9 +51,8 @@ function update_authorize_run_update($filetransfer, $projects) {
     'file' => drupal_get_path('module', 'update') . '/update.authorize.inc',
   );
 
+  // Batch will be excuted via authorized.php
   batch_set($batch);
-  // Invoke the batch via authorize.php.
-  return system_authorized_batch_process();
 }
 
 /**
@@ -95,10 +94,9 @@ function update_authorize_run_install($filetransfer, $project, $updater_name, $l
     'finished' => 'update_authorize_install_batch_finished',
     'file' => drupal_get_path('module', 'update') . '/update.authorize.inc',
   );
-  batch_set($batch);
 
-  // Invoke the batch via authorize.php.
-  return system_authorized_batch_process();
+  // Batch will be excuted via authorized.php.
+  batch_set($batch);
 }
 
 /**