reverted:
--- b/core/themes/bartik/templates/block--system-page-actions-block.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "@block/block.html.twig" %}
-{#
-/**
- * @file
- * Bartik's theme implementation for page local actions.
- *
- * Available variables:
- * - action_links: Actions local to the page, such as "Add menu" on the menu
- *   administration interface.
- *
- * @ingroup themeable
- */
-#}
-{% block content %}
-  {% if action_links %}
-    <ul class="action-links">
-      {{ action_links }}
-    </ul>
-  {% endif %}
-{% endblock %}
reverted:
--- b/core/themes/bartik/templates/block--system-page-tabs-block.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "@block/block.html.twig" %}
-{#
-/**
- * @file
- * Bartik's theme implementation for page tabs.
- *
- * Available variables:
- * - tabs: The Tabs linking to any sub-pages beneath the current page (e.g., the
- *   view and edit tabs when displaying a node).
- *
- * @ingroup themeable
- */
-#}
-{% block content %}
-  {% if tabs %}
-     <nav class="tabs" role="navigation" aria-label="{{ 'Tabs'|t }}">
-       {{ tabs }}
-     </nav>
-  {% endif %}
-{% endblock %}
reverted:
--- b/core/themes/classy/templates/block/block--system-page-actions-block.html.twig
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "@block/block.html.twig" %}
-{#
-/**
- * @file
- * Default theme implementation for page local actions.
- *
- * Available variables:
- * - action_links: Actions local to the page, such as "Add menu" on the menu
- *   administration interface.
- *
- * @ingroup themeable
- */
-#}
-{% block content %}
-  {% if action_links %}
-    <nav class="action-links">{{ action_links }}</nav>
-  {% endif %}
-{% endblock %}
reverted:
--- b/core/themes/classy/templates/block/block--system-page-tabs-block.html.twig
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends "@block/block.html.twig" %}
-{#
-/**
- * @file
- * Default theme implementation for page tabs.
- *
- * Available variables:
- * - tabs: The Tabs linking to any sub-pages beneath the current page (e.g., the
- *   view and edit tabs when displaying a node).
- *
- * @ingroup themeable
- */
-#}
-{% block content %}
-  {{ tabs }}
-{% endblock %}
only in patch2:
unchanged:
--- /dev/null
+++ b/core/themes/classy/templates/block/block--system-local-actions-block.html.twig
@@ -0,0 +1,18 @@
+{% extends "@block/block.html.twig" %}
+{#
+/**
+ * @file
+ * Default theme implementation for page local actions.
+ *
+ * Available variables:
+ * - action_links: Actions local to the page, such as "Add menu" on the menu
+ *   administration interface.
+ *
+ * @ingroup themeable
+ */
+#}
+{% block content %}
+  {% if action_links %}
+    <nav class="action-links">{{ action_links }}</nav>
+  {% endif %}
+{% endblock %}
only in patch2:
unchanged:
--- /dev/null
+++ b/core/themes/classy/templates/block/block--system-tabs-block.html.twig
@@ -0,0 +1,18 @@
+{% extends "@block/block.html.twig" %}
+{#
+/**
+ * @file
+ * Default theme implementation for page tabs.
+ *
+ * Available variables:
+ * - tabs: The Tabs linking to any sub-pages beneath the current page (e.g., the
+ *   view and edit tabs when displaying a node).
+ *
+ * @ingroup themeable
+ */
+#}
+{% block content %}
+  <nav class="tabs" role="navigation" aria-label="{{ 'Tabs'|t }}">
+    {{ tabs }}
+  </nav>
+{% endblock %}