diff --git a/scheduler.module b/scheduler.module
index 0bffc7e..010f7bc 100644
--- a/scheduler.module
+++ b/scheduler.module
@@ -183,17 +183,11 @@ function scheduler_form_node_form_alter(&$form, FormStateInterface $form_state)
   foreach (['publish_on' => $publishing_enabled, 'unpublish_on' => $unpublishing_enabled] as $field => $enabled) {
     $actual_widget_id = $content[$field]['type'];
     if ($enabled && $actual_widget_id != $correct_widget_id) {
-      // The route to the node_type form display is not included in core
-      // node.routing.yml, hence entity.node_type.form_display is defined in
-      // scheduler.routing.yml temporarily.
-      // @todo Remove from scheduler.routing.yml when added to core
-      // @see https://www.drupal.org/node/2848213 - scheduler issue
-      // @see https://www.drupal.org/node/2865983 - core issue
       drupal_set_message(t('The widget for field %field is incorrectly set to %wrong. This should be changed to %correct by an admin user via <a href="@link">content type form display</a>', [
         '%field' => (string) $form[$field]['widget']['#title'],
         '%correct' => (string) $pluginDefinitions[$correct_widget_id]['label'],
         '%wrong' => (string) $pluginDefinitions[$actual_widget_id]['label'],
-        '@link' => Url::fromRoute('entity.node_type.form_display', ['node_type' => $type->get('type')])->toString(),
+        '@link' => Url::fromRoute('entity.entity_form_display.node.default', ['node_type' => $type->get('type')])->toString(),
       ]), 'warning', FALSE);
     }
   }
diff --git a/scheduler.routing.yml b/scheduler.routing.yml
index 0c8f736..33774ef 100644
--- a/scheduler.routing.yml
+++ b/scheduler.routing.yml
@@ -25,14 +25,3 @@ scheduler.lightweight_cron:
     no_cache: TRUE
   requirements:
     _custom_access: '\Drupal\scheduler\Controller\LightweightCronController::access'
-
-# entity.node_type.form_display should be in core node.routing.yml
-# @todo remove this when added to core
-# @see https://www.drupal.org/node/2848213 - scheduler issue
-# @see https://www.drupal.org/node/2865983 - core issue
-entity.node_type.form_display:
-  path: '/admin/structure/types/manage/{node_type}/form-display'
-  defaults:
-    _entity_form: 'node_type.edit'
-  requirements:
-    _permission: 'administer content types'
diff --git a/scheduler.info.yml b/scheduler.info.yml
index 4a24872..8355580 100644
--- a/scheduler.info.yml
+++ b/scheduler.info.yml
@@ -7,6 +7,7 @@ dependencies:
   - drupal:action
   - drupal:datetime
   - drupal:field
+  - drupal:field_ui
   - drupal:node
   - drupal:views
 libraries: