diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index 7be85f5..6ed4269 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -121,7 +121,7 @@ function aggregator_menu() {
   );
   $items['admin/config/services/aggregator/update/%aggregator_feed'] = array(
     'title' => 'Update items',
-    'route_name' => 'aggregator_admin_refresh_feed',
+    'route_name' => 'aggregator_feed_refresh',
   );
   $items['admin/config/services/aggregator/list'] = array(
     'title' => 'List',
diff --git a/core/modules/aggregator/aggregator.routing.yml b/core/modules/aggregator/aggregator.routing.yml
index f5f2bb5..e7d59ed 100644
--- a/core/modules/aggregator/aggregator.routing.yml
+++ b/core/modules/aggregator/aggregator.routing.yml
@@ -22,20 +22,20 @@ aggregator_feed_delete:
 aggregator_feed_add:
   pattern: '/admin/config/services/aggregator/add/feed'
   defaults:
-    _controller: '\Drupal\aggregator\Routing\AggregatorController::feedAdd'
+    _content: '\Drupal\aggregator\Routing\AggregatorController::feedAdd'
   requirements:
     _permission: 'administer news feeds'
 
-aggregator_opml_add:
-  pattern: '/admin/config/services/aggregator/add/opml'
+aggregator_feed_refresh:
+  pattern: '/admin/config/services/aggregator/update/{aggregator_feed}'
   defaults:
-    _form: '\Drupal\aggregator\Form\OpmlFeedAdd'
+    _controller: '\Drupal\aggregator\Routing\AggregatorController::feedRefresh'
   requirements:
     _permission: 'administer news feeds'
 
-aggregator_admin_refresh_feed:
-  pattern: '/admin/config/services/aggregator/update/{aggregator_feed}'
+aggregator_opml_add:
+  pattern: '/admin/config/services/aggregator/add/opml'
   defaults:
-    _controller: '\Drupal\aggregator\Routing\AggregatorController::feedRefresh'
+    _form: '\Drupal\aggregator\Form\OpmlFeedAdd'
   requirements:
     _permission: 'administer news feeds'
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Routing/AggregatorController.php b/core/modules/aggregator/lib/Drupal/aggregator/Routing/AggregatorController.php
index 1409fe9..a4e0b5a 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Routing/AggregatorController.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Routing/AggregatorController.php
@@ -9,9 +9,9 @@
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Drupal\Core\ControllerInterface;
-use Drupal\aggregator\Plugin\Core\Entity\Feed;
 use Drupal\Core\Entity\EntityManager;
 use Drupal\aggregator\FeedInterface;
 
@@ -51,7 +51,10 @@ public function __construct(EntityManager $entity_manager, Request $request) {
    * {inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    return new static($container->get('plugin.manager.entity'), $container->get('request'));
+    return new static(
+      $container->get('plugin.manager.entity'),
+      $container->get('request')
+    );
   }
 
   /**
@@ -85,8 +88,9 @@ public function feedRefresh(FeedInterface $aggregator_feed) {
       throw new AccessDeniedHttpException();
     }
 
+    // @todo after https://drupal.org/node/1972246 find a new place for it.
     aggregator_refresh($aggregator_feed);
-    drupal_goto('admin/config/services/aggregator');
+    return new RedirectResponse(url('admin/config/services/aggregator'));
   }
 
 }