diff -u b/core/modules/system/src/Plugin/Block/SystemLocalActionsBlock.php b/core/modules/system/src/Plugin/Block/SystemLocalActionsBlock.php
--- b/core/modules/system/src/Plugin/Block/SystemLocalActionsBlock.php
+++ b/core/modules/system/src/Plugin/Block/SystemLocalActionsBlock.php
@@ -103,7 +103,7 @@
 
     // The "Local actions" block is never cacheable because hooks creating local
     // actions don't provide cacheability metadata.
-    // @todo Remove after https://www.drupal.org/node/2511508 has landed.
+    // @todo Remove after https://www.drupal.org/node/2511516 has landed.
     $form['cache']['#disabled'] = TRUE;
     $form['cache']['#description'] = $this->t('This block is never cacheable.');
     $form['cache']['max_age']['#value'] = 0;
@@ -115,7 +115,7 @@
    * {@inheritdoc}
    */
   public function getCacheMaxAge() {
-    // @todo Remove after https://www.drupal.org/node/2511508 has landed.
+    // @todo Remove after https://www.drupal.org/node/2511516 has landed.
     return 0;
   }
 
diff -u b/core/modules/system/src/Plugin/Block/SystemTabsBlock.php b/core/modules/system/src/Plugin/Block/SystemTabsBlock.php
--- b/core/modules/system/src/Plugin/Block/SystemTabsBlock.php
+++ b/core/modules/system/src/Plugin/Block/SystemTabsBlock.php
@@ -83,7 +83,7 @@
 
     // The "Page actions" block is never cacheable because of hooks creating
     // local tasks doesn't provide cacheability metadata.
-    // @todo Remove after https://www.drupal.org/node/2511508 has landed.
+    // @todo Remove after https://www.drupal.org/node/2511516 has landed.
     $form['cache']['#disabled'] = TRUE;
     $form['cache']['#description'] = $this->t('This block is never cacheable.');
     $form['cache']['max_age']['#value'] = 0;
@@ -95,7 +95,7 @@
    * {@inheritdoc}
    */
   public function getCacheMaxAge() {
-    // @todo Remove after https://www.drupal.org/node/2511508 has landed.
+    // @todo Remove after https://www.drupal.org/node/2511516 has landed.
     return 0;
   }
 
diff -u b/core/themes/seven/templates/page.html.twig b/core/themes/seven/templates/page.html.twig
--- b/core/themes/seven/templates/page.html.twig
+++ b/core/themes/seven/templates/page.html.twig
@@ -77,11 +77,7 @@
           {{ page.help }}
         </div>
       {% endif %}
-      {% if page.actions %}
-        <ul class="action-links">
-          {{ page.actions }}
-        </ul>
-      {% endif %}
+      {{ page.actions }}
       {{ page.content }}
     </main>