diff --git a/core/lib/Drupal/Core/Annotation/Menu/LocalTask.php b/core/lib/Drupal/Core/Annotation/Menu/LocalTask.php
index 52ef6a1..bb97814 100644
--- a/core/lib/Drupal/Core/Annotation/Menu/LocalTask.php
+++ b/core/lib/Drupal/Core/Annotation/Menu/LocalTask.php
@@ -40,6 +40,13 @@ class LocalTask extends Plugin {
   public $route_name;
 
   /**
+   * The route name.
+   *
+   * @var array
+   */
+  public $route_parameters = array();
+
+  /**
    * The plugin ID of the root tab.
    *
    * @var array
@@ -49,7 +56,7 @@ class LocalTask extends Plugin {
   /**
    * The plugin ID of the parent tab (or NULL for a top-level tab).
    *
-   * @var array|NULL
+   * @var string|NULL
    */
   public $tab_parent_id;
 
diff --git a/core/lib/Drupal/Core/Menu/LocalTaskBase.php b/core/lib/Drupal/Core/Menu/LocalTaskBase.php
index b1cd894..6a09b56 100644
--- a/core/lib/Drupal/Core/Menu/LocalTaskBase.php
+++ b/core/lib/Drupal/Core/Menu/LocalTaskBase.php
@@ -95,8 +95,8 @@ public function getRouteParameters(Request $request) {
     // then $request_raw_variables is array('node' => 2).
     $request_raw_variables = $request->attributes->get('_raw_variables');
     foreach ($variables as $name) {
-      if (!isset($parameters[$name]) && isset($request_raw_variables[$name])) {
-        $parameters[$name] = $request_raw_variables[$name];
+      if (!isset($parameters[$name]) && $request_raw_variables->has($name)) {
+        $parameters[$name] = $request_raw_variables->get($name);
       }
     }
     return $parameters;
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 973bccb..436ab96 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -206,28 +206,11 @@ function comment_menu() {
     'title' => 'Comment permalink',
     'route_name' => 'comment_permalink',
   );
-  $items['comment/%comment/view'] = array(
-    'title' => 'View comment',
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-  );
-  // Every other comment path uses %, but this one loads the comment directly,
-  // so we don't end up loading it twice (in the page and access callback).
-  $items['comment/%comment/edit'] = array(
-    'title' => 'Edit',
-    'type' => MENU_LOCAL_TASK,
-    'route_name' => 'comment_edit_page',
-  );
   $items['comment/%comment/approve'] = array(
     'title' => 'Approve',
     'weight' => 10,
     'route_name' => 'comment_approve',
   );
-  $items['comment/%comment/delete'] = array(
-    'title' => 'Delete',
-    'type' => MENU_LOCAL_TASK,
-    'route_name' => 'comment_confirm_delete',
-    'weight' => 20,
-  );
   $items['comment/reply/%node'] = array(
     'title' => 'Add new comment',
     'page callback' => 'comment_reply',
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Menu/LocalTask/CommentDeleteTask.php b/core/modules/comment/lib/Drupal/comment/Plugin/Menu/LocalTask/CommentDeleteTask.php
new file mode 100644
index 0000000..265ec92
--- /dev/null
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/Menu/LocalTask/CommentDeleteTask.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\comment\Plugin\Menu\LocalTask\CommentDeleteTask.
+ */
+
+namespace Drupal\comment\Plugin\Menu\LocalTask;
+
+use Drupal\Core\Annotation\Translation;
+use Drupal\Core\Menu\LocalTaskBase;
+use Drupal\Core\Annotation\Menu\LocalTask;
+
+/**
+ * @LocalTask(
+ *   id = "comment_confirm_delete_tab",
+ *   route_name = "comment_confirm_delete",
+ *   title = @Translation("Delete"),
+ *   tab_root_id = "comment_permalink_tab",
+ *   weight = "10"
+ * )
+ */
+class CommentDeleteTask extends LocalTaskBase {
+
+}
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Menu/LocalTask/CommentEditTask.php b/core/modules/comment/lib/Drupal/comment/Plugin/Menu/LocalTask/CommentEditTask.php
new file mode 100644
index 0000000..4ea60e5
--- /dev/null
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/Menu/LocalTask/CommentEditTask.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\comment\Plugin\Menu\LocalTask\CommentEditTask.
+ */
+
+namespace Drupal\comment\Plugin\Menu\LocalTask;
+
+use Drupal\Core\Annotation\Translation;
+use Drupal\Core\Menu\LocalTaskBase;
+use Drupal\Core\Annotation\Menu\LocalTask;
+
+/**
+ * @LocalTask(
+ *   id = "comment_edit_page_tab",
+ *   route_name = "comment_edit_page",
+ *   title = @Translation("Edit"),
+ *   tab_root_id = "comment_permalink_tab",
+ *   weight = "0"
+ * )
+ */
+class CommentEditTask extends LocalTaskBase {
+
+}
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Menu/LocalTask/CommentViewTask.php b/core/modules/comment/lib/Drupal/comment/Plugin/Menu/LocalTask/CommentViewTask.php
new file mode 100644
index 0000000..bfc0221
--- /dev/null
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/Menu/LocalTask/CommentViewTask.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\comment\Plugin\Menu\LocalTask\CommentViewTask.
+ */
+
+namespace Drupal\comment\Plugin\Menu\LocalTask;
+
+use Drupal\Core\Annotation\Translation;
+use Drupal\Core\Menu\LocalTaskBase;
+use Drupal\Core\Annotation\Menu\LocalTask;
+
+/**
+ * @LocalTask(
+ *   id = "comment_permalink_tab",
+ *   route_name = "comment_permalink",
+ *   title = @Translation("View comment"),
+ *   tab_root_id = "comment_permalink_tab"
+ * )
+ */
+class CommentViewTask extends LocalTaskBase {
+
+}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/LocalTasksTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/LocalTasksTest.php
index 1a32725..9f19285 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/LocalTasksTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/LocalTasksTest.php
@@ -155,7 +155,7 @@ public function testPluginLocalTask() {
     ));
 
     // Ensure the view tab is active.
-    $result = $this->xpath('//ul[contains(@class, "tabs")]//a[contains(@class, "active")]');
+    $result = $this->xpath('//ul[contains(@class, "tabs")]//li[contains(@class, "active")]/a');
     $this->assertEqual(1, count($result), 'There is just a single active tab.');
     $this->assertEqual('View', (string) $result[0], 'The view tab is active.');
 
@@ -167,7 +167,7 @@ public function testPluginLocalTask() {
       'menu-local-task-test/tasks/settings/sub2',
     ), 1);
 
-    $result = $this->xpath('//ul[contains(@class, "tabs")]//a[contains(@class, "active")]');
+    $result = $this->xpath('//ul[contains(@class, "tabs")]//li[contains(@class, "active")]/a');
     $this->assertEqual(1, count($result), 'There is just a single active tab.');
     $this->assertEqual('Settings', (string) $result[0], 'The settings tab is active.');
 
@@ -178,7 +178,7 @@ public function testPluginLocalTask() {
       'menu-local-task-test/tasks/settings/sub2',
     ), 1);
 
-    $result = $this->xpath('//ul[contains(@class, "tabs")]//a[contains(@class, "active")]');
+    $result = $this->xpath('//ul[contains(@class, "tabs")]//li[contains(@class, "active")]/a');
     $this->assertEqual(2, count($result), 'There are tabs active on both levels.');
     $this->assertEqual('Settings', (string) $result[0], 'The settings tab is active.');
     $this->assertEqual('sub1', (string) $result[1], 'The sub1 tab is active.');