diff --git a/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php b/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php
index 6beeedf..83e5646 100644
--- a/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php
+++ b/core/modules/menu/lib/Drupal/menu/Controller/MenuController.php
@@ -88,8 +88,6 @@ public function getParentOptions(Request $request) {
    *   Returns the menu link submission form.
    */
   public function addLink(MenuInterface $menu) {
-    // @todo Remove this when https://drupal.org/node/1981644 is in.
-    drupal_set_title(t('Add menu link'));
     $menu_link = $this->menuLinkStorage->create(array(
       'mlid' => 0,
       'plid' => 0,
diff --git a/core/modules/menu/lib/Drupal/menu/MenuFormController.php b/core/modules/menu/lib/Drupal/menu/MenuFormController.php
index 68bc6a4..492b757 100644
--- a/core/modules/menu/lib/Drupal/menu/MenuFormController.php
+++ b/core/modules/menu/lib/Drupal/menu/MenuFormController.php
@@ -70,7 +70,7 @@ public function form(array $form, array &$form_state) {
     $menu = $this->entity;
 
     if ($this->operation == 'edit') {
-      drupal_set_title(t('Edit menu %label', array('%label' => $menu->label())), PASS_THROUGH);
+      $form['#title'] = t('Edit menu %label', array('%label' => $menu->label()));
     }
 
     $form['label'] = array(
diff --git a/core/modules/menu/menu.routing.yml b/core/modules/menu/menu.routing.yml
index 21743dd..882d83c 100644
--- a/core/modules/menu/menu.routing.yml
+++ b/core/modules/menu/menu.routing.yml
@@ -24,6 +24,7 @@ menu.link_add:
   path: '/admin/structure/menu/manage/{menu}/add'
   defaults:
     _content: '\Drupal\menu\Controller\MenuController::addLink'
+    _title: 'Add menu link'
   requirements:
     _entity_create_access: 'menu_link'