diff --git a/core/modules/big_pipe/big_pipe.module b/core/modules/big_pipe/big_pipe.module
index 18bbbb22cda89c9243463cf3fd2fc97c96ef4857..fa0518ad3d1fff9db8a44f25a089e1a04fb58f01 100644
--- a/core/modules/big_pipe/big_pipe.module
+++ b/core/modules/big_pipe/big_pipe.module
@@ -58,8 +58,7 @@ function big_pipe_page_attachments(array &$page) {
           '#noscript' => TRUE,
           '#attributes' => [
             'http-equiv' => 'Refresh',
-            // @todo: Switch to Url::fromRoute() once https://www.drupal.org/node/2589967 is resolved.
-            'content' => '0; URL=' . Url::fromUri('internal:/big_pipe/no-js', ['query' => \Drupal::service('redirect.destination')->getAsArray()])->toString(),
+            'content' => '0; URL=' . Url::fromRoute('big_pipe.nojs', [], ['query' => \Drupal::service('redirect.destination')->getAsArray()])->toString(),
           ],
         ],
         'big_pipe_detect_nojs',
diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml
index 547b083058aeab20cb2ce2af7e38cf3589ac0ba8..85662e83be6e62cfa382953939ba6a30d4508f3c 100644
--- a/core/modules/system/system.routing.yml
+++ b/core/modules/system/system.routing.yml
@@ -452,8 +452,6 @@ system.batch_page.html:
     _format: 'html'
   options:
     _admin_route: TRUE
-    # @todo Remove the '_no_big_pipe' route option when https://www.drupal.org/node/2589967 lands.
-    _no_big_pipe: TRUE
 
 system.batch_page.json:
   path: '/batch'