diff --git a/core/lib/Drupal/Core/Annotation/Menu/LocalTask.php b/core/lib/Drupal/Core/Annotation/Menu/LocalTask.php
deleted file mode 100644
index 52ef6a1..0000000
--- a/core/lib/Drupal/Core/Annotation/Menu/LocalTask.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\Annotation\Menu\LocalTask.
- */
-
-namespace Drupal\Core\Annotation\Menu;
-
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Defines a local task plugin annotation object.
- *
- * @Annotation
- */
-class LocalTask extends Plugin {
-
-  /**
-   * The ID.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The static title for the local task.
-   *
-   * @ingroup plugin_translatable
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   */
-  public $title;
-
-  /**
-   * The route name.
-   *
-   * @var string
-   */
-  public $route_name;
-
-  /**
-   * The plugin ID of the root tab.
-   *
-   * @var array
-   */
-  public $tab_root_id;
-
-  /**
-   * The plugin ID of the parent tab (or NULL for a top-level tab).
-   *
-   * @var array|NULL
-   */
-  public $tab_parent_id;
-
-  /**
-   * The weight of the tab.
-   *
-   * @var int|NULL
-   */
-  public $weight;
-
-  /**
-   * The default link options.
-   *
-   * @var array (optional)
-   */
-  public $options = array();
-
-}
diff --git a/core/lib/Drupal/Core/Menu/LocalTaskBase.php b/core/lib/Drupal/Core/Menu/LocalTaskBase.php
index 7568d2b..d32ce4c 100644
--- a/core/lib/Drupal/Core/Menu/LocalTaskBase.php
+++ b/core/lib/Drupal/Core/Menu/LocalTaskBase.php
@@ -16,7 +16,7 @@
 /**
  * Provides defaults and base methods for menu local tasks plugins.
  */
-abstract class LocalTaskBase extends PluginBase implements LocalTaskInterface, ContainerFactoryPluginInterface{
+class LocalTaskBase extends PluginBase implements LocalTaskInterface, ContainerFactoryPluginInterface {
 
   /**
    * String translation object.
diff --git a/core/lib/Drupal/Core/Menu/LocalTaskDefault.php b/core/lib/Drupal/Core/Menu/LocalTaskDefault.php
deleted file mode 100644
index 57e32df..0000000
--- a/core/lib/Drupal/Core/Menu/LocalTaskDefault.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\Menu\LocalTaskDefault.
- */
-
-namespace Drupal\Core\Menu;
-
-
-/**
- * Default object used for LocalTaskPlugins.
- */
-class LocalTaskDefault extends LocalTaskBase {
-
-}
\ No newline at end of file
diff --git a/core/lib/Drupal/Core/Menu/LocalTaskManager.php b/core/lib/Drupal/Core/Menu/LocalTaskManager.php
index 791c639..e31255b 100644
--- a/core/lib/Drupal/Core/Menu/LocalTaskManager.php
+++ b/core/lib/Drupal/Core/Menu/LocalTaskManager.php
@@ -8,7 +8,7 @@
 namespace Drupal\Core\Menu;
 
 use Drupal\Component\Plugin\Discovery\ProcessDecorator;
-use Drupal\Component\Plugin\PluginManagerBase;
+use Drupal\Core\Plugin\DefaultPluginManager;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Plugin\Discovery\ContainerDerivativeDiscoveryDecorator;
 use Drupal\Core\Plugin\Discovery\YamlDiscovery;
@@ -24,13 +24,14 @@
  * Derivatives are supported for modules that wish to generate multiple tabs on
  * behalf of something else.
  */
-class LocalTaskManager extends PluginManagerBase {
+class LocalTaskManager extends DefaultPluginManager {
 
   protected $defaults = array(
     // The ID.
-    'title' => '',
-    // The static title for the local task.
     'id' => '',
+    // The static title for the local task.
+    'title' => '',
+    // The route name.
     'route_name' => '',
     // The plugin ID of the root tab.
     'tab_root_id' => '',
@@ -41,7 +42,7 @@ class LocalTaskManager extends PluginManagerBase {
     // The default link options.
     'options' => array(),
     // Default class for local task implementations.
-    'class' => 'Drupal\Core\Menu\LocalTaskDefault',
+    'class' => 'Drupal\Core\Menu\LocalTaskBase',
   );
 
   /**
@@ -85,13 +86,12 @@ class LocalTaskManager extends PluginManagerBase {
    *   The module handler.
    */
   public function __construct(ControllerResolverInterface $controller_resolver, Request $request, RouteProviderInterface $route_provider, ModuleHandlerInterface $module_handler) {
-
     $this->controllerResolver = $controller_resolver;
     $this->request = $request;
     $this->routeProvider = $route_provider;
 
-    // @todo caching/compiling, translations and altering.
-    // $this->alterInfo($module_handler, 'local_tasks');
+    // @todo caching.
+    $this->alterInfo($module_handler, 'local_tasks');
     $this->discovery = new YamlDiscovery('local_tasks', array_values($module_handler->getModuleDirectories()));
     $this->discovery = new ContainerDerivativeDiscoveryDecorator($this->discovery);
     $this->discovery = new ProcessDecorator($this->discovery, array($this, 'processDefinition'));