diff --git a/core/modules/filter/filter.local_tasks.yml b/core/modules/filter/filter.local_tasks.yml
new file mode 100644
index 0000000..9f7e8e9
--- /dev/null
+++ b/core/modules/filter/filter.local_tasks.yml
@@ -0,0 +1,5 @@
+filter.format_edit_tab:
+  route_name: filter.format_edit
+  title: 'Configure'
+  tab_root_id: filter.format_edit_tab
+  weight: -10
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index ea98965..2cdc275 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -149,11 +149,6 @@ function filter_menu() {
     'title arguments' => array(5),
     'route_name' => 'filter.format_edit',
   );
-  $items['admin/config/content/formats/manage/%/edit'] = array(
-    'title' => 'Configure',
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-    'weight' => -10,
-  );
   $items['admin/config/content/formats/manage/%/disable'] = array(
     'title' => 'Disable text format',
     'route_name' => 'filter.admin_disable',
diff --git a/core/modules/system/system.local_tasks.yml b/core/modules/system/system.local_tasks.yml
new file mode 100644
index 0000000..b29773d
--- /dev/null
+++ b/core/modules/system/system.local_tasks.yml
@@ -0,0 +1,14 @@
+system.rss_feeds_settings_tab:
+  route_name: system.rss_feeds_settings
+  title: Settings
+  tab_root_id: system.rss_feeds_settings_tab
+
+system.site_maintenance_mode_settings_tab:
+  route_name: system.site_maintenance_mode
+  title: Settings
+  tab_root_id: system.site_maintenance_mode_settings_tab
+
+system.site_information_settings_tab:
+  route_name: system.site_information_settings
+  title: Settings
+  tab_root_id: system.site_information_settings_tab
diff --git a/core/modules/user/user.local_tasks.yml b/core/modules/user/user.local_tasks.yml
new file mode 100644
index 0000000..c82874b
--- /dev/null
+++ b/core/modules/user/user.local_tasks.yml
@@ -0,0 +1,4 @@
+user.role_list_tab:
+  route_name: user.role_list
+  title: 'Roles'
+  tab_root_id: user.role_list_tab
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 24aee74..c73155b 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -791,12 +791,6 @@ function user_menu() {
     'route_name' => 'user.admin_permissions',
     'type' => MENU_LOCAL_TASK,
   );
-  $items['admin/people/roles'] = array(
-    'title' => 'Roles',
-    'description' => 'List, edit, or add user roles.',
-    'route_name' => 'user.role_list',
-    'type' => MENU_LOCAL_TASK,
-  );
   $items['admin/people/roles/add'] = array(
     'title' => 'Add role',
     'route_name' => 'user.role_add',