diff --git a/core/modules/block/custom_block/custom_block.local_actions.yml b/core/modules/block/custom_block/custom_block.local_actions.yml
new file mode 100644
index 0000000..b272691
--- /dev/null
+++ b/core/modules/block/custom_block/custom_block.local_actions.yml
@@ -0,0 +1,5 @@
+custom_block_type_add:
+  route_name: custom_block_type_add
+  title: 'Add custom block type'
+  appears_on:
+    - custom_block_type_list
diff --git a/core/modules/block/custom_block/custom_block.module b/core/modules/block/custom_block/custom_block.module
index 3e9e024..9c892de 100644
--- a/core/modules/block/custom_block/custom_block.module
+++ b/core/modules/block/custom_block/custom_block.module
@@ -47,7 +47,7 @@ function custom_block_menu_local_tasks(&$data, $router_item, $root_path) {
     if ($item['access']) {
       // Add a destination parameter.
       $item['localized_options']['query']['destination'] = 'admin/structure/custom-blocks';
-      $data['actions']['block/add/o'] = array(
+      $data['actions']['block/add'] = array(
         '#theme' => 'menu_local_action',
         '#link' => $item,
       );
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Menu/LocalAction/CustomBlockTypeAdd.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Menu/LocalAction/CustomBlockTypeAdd.php
deleted file mode 100644
index 5549b03..0000000
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Menu/LocalAction/CustomBlockTypeAdd.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\custom_block\Plugin\Menu\CustomBlockTypeAdd.
- */
-
-namespace Drupal\custom_block\Plugin\Menu\LocalAction;
-
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Menu\LocalActionBase;
-use Drupal\Core\Annotation\Menu\LocalAction;
-
-/**
- * @LocalAction(
- *   id = "custom_block_type_add",
- *   route_name = "custom_block_type_add",
- *   title = @Translation("Add custom block type"),
- *   appears_on = {"custom_block_type_list"}
- * )
- */
-class CustomBlockTypeAdd extends LocalActionBase {
-
-}