diff --git a/core/lib/Drupal/Core/Form/FormState.php b/core/lib/Drupal/Core/Form/FormState.php
index 39745b3..5733d5a 100644
--- a/core/lib/Drupal/Core/Form/FormState.php
+++ b/core/lib/Drupal/Core/Form/FormState.php
@@ -635,20 +635,12 @@ public function getRedirect() {
 
     // Check for a route-based redirection.
     if ($redirect_route = $this->get('redirect_route')) {
-      // @todo Remove once all redirects are converted to \Drupal\Core\Url. See
-      //   https://www.drupal.org/node/2189661.
-      if (!($redirect_route instanceof Url)) {
-        $redirect_route += array(
-          'route_parameters' => array(),
-          'options' => array(),
-        );
-        $redirect_route = new Url($redirect_route['route_name'], $redirect_route['route_parameters'], $redirect_route['options']);
-      }
-
       $redirect_route->setAbsolute();
       return $redirect_route;
     }
 
+    // @todo Remove once all redirects are converted away from paths in
+    //   https://www.drupal.org/node/2315807.
     return $this->get('redirect');
   }
 
diff --git a/core/tests/Drupal/Tests/Core/Form/FormStateTest.php b/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
index 8e1ca97..5aaf2c3 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
@@ -50,8 +50,6 @@ public function providerTestGetRedirect() {
     $redirect = new RedirectResponse('/example');
     $data[] = array(array('redirect' => $redirect), $redirect);
 
-    $data[] = array(array('redirect_route' => array('route_name' => 'test_route_a')), new Url('test_route_a', array(), array('absolute' => TRUE)));
-    $data[] = array(array('redirect_route' => array('route_name' => 'test_route_b', 'route_parameters' => array('key' => 'value'))), new Url('test_route_b', array('key' => 'value'), array('absolute' => TRUE)));
     $data[] = array(array('redirect_route' => new Url('test_route_b', array('key' => 'value'))), new Url('test_route_b', array('key' => 'value'), array('absolute' => TRUE)));
 
     $data[] = array(array('programmed' => TRUE), NULL);