diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Access/TermDeleteAccessCheck.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Access/TermDeleteAccessCheck.php
new file mode 100644
index 0000000..a81a515
--- /dev/null
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Access/TermDeleteAccessCheck.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\taxonomy\Access\TermDeleteAccessCheck.
+ */
+
+namespace Drupal\taxonomy\Access;
+
+use Drupal\Core\Access\AccessCheckInterface;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Access check for taxonomy term delete routes.
+ */
+class TermDeleteAccessCheck implements AccessCheckInterface {
+
+  /**
+   * Implements AccessCheckInterface::applies().
+   */
+  public function applies(Route $route) {
+    return array_key_exists('_access_taxonomy_term_delete', $route->getRequirements());
+  }
+
+  /**
+   * Implements AccessCheckInterface::access().
+   */
+  public function access(Route $route, Request $request) {
+    if ($entity = $request->attributes->get('taxonomy_term')) {
+      return $entity->access('delete');
+    }
+    return FALSE;
+  }
+
+}
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Access/VocabularyDeleteAccessCheck.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Access/VocabularyDeleteAccessCheck.php
new file mode 100644
index 0000000..e9563f2
--- /dev/null
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Access/VocabularyDeleteAccessCheck.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\taxonomy\Access\VocabularyDeleteAccessCheck.
+ */
+
+namespace Drupal\taxonomy\Access;
+
+use Drupal\Core\Access\AccessCheckInterface;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Access check for taxonomy vocabulary delete routes.
+ */
+class VocabularyDeleteAccessCheck implements AccessCheckInterface {
+
+  /**
+   * Implements AccessCheckInterface::applies().
+   */
+  public function applies(Route $route) {
+    return array_key_exists('_access_taxonomy_vocabulary_delete', $route->getRequirements());
+  }
+
+  /**
+   * Implements AccessCheckInterface::access().
+   */
+  public function access(Route $route, Request $request) {
+    if ($entity = $request->attributes->get('taxonomy_vocabulary')) {
+      return $entity->access('delete');
+    }
+    return FALSE;
+  }
+
+}
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDelete.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDelete.php
new file mode 100644
index 0000000..f214adc
--- /dev/null
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDelete.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\taxonomy\Form\TermDelete.
+ */
+
+namespace Drupal\taxonomy\Form;
+
+use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\taxonomy\Plugin\Core\Entity\Term;
+use Drupal\Core\Cache\Cache;
+
+/**
+ * Provides a deletion confirmation form for items that belong to a feed.
+ */
+class TermDelete extends ConfirmFormBase {
+
+  /**
+   * The feed the items being deleted belong to.
+   *
+   * @var \Drupal\taxonomy\Plugin\Core\Entity\Term
+   */
+  protected $taxonomy_term;
+
+  /**
+   * Implements \Drupal\Core\Form\FormInterface::getFormID().
+   */
+  public function getFormID() {
+    return 'taxonomy_term_delete_form';
+  }
+
+  /**
+   * Implements \Drupal\Core\Form\ConfirmFormBase::getQuestion().
+   */
+  protected function getQuestion() {
+    return t('Are you sure you want to delete the term %title?', array('%title' => $this->taxonomy_term->label()));
+  }
+
+  /**
+   * Implements \Drupal\Core\Form\ConfirmFormBase::getCancelPath().
+   */
+  protected function getCancelPath() {
+    return 'admin/structure/taxonomy';
+  }
+
+  /**
+   * Overrides \Drupal\Core\Form\ConfirmFormBase::getDescription().
+   */
+  protected function getDescription() {
+    return t('Deleting a term will delete all its children if there are any. This action cannot be undone.');
+  }
+
+  /**
+   * Overrides \Drupal\Core\Form\ConfirmFormBase::getConfirmText().
+   */
+  protected function getConfirmText() {
+    return t('Delete');
+  }
+
+  /**
+   * Overrides \Drupal\Core\Form\ConfirmFormBase::buildForm().
+   */
+  public function buildForm(array $form, array &$form_state, Term $taxonomy_term = NULL) {
+    $this->taxonomy_term = $taxonomy_term;
+    return parent::buildForm($form, $form_state);
+  }
+
+  /**
+   * Implements \Drupal\Core\Form\FormInterface::submitForm().
+   */
+  public function submitForm(array &$form, array &$form_state) {
+    $this->taxonomy_term->delete();
+    taxonomy_check_vocabulary_hierarchy(entity_load('taxonomy_vocabulary', $this->taxonomy_term->bundle()), array('tid' => $this->taxonomy_term->id()));
+    drupal_set_message(t('Deleted term %name.', array('%name' => $this->taxonomy_term->label())));
+    watchdog('taxonomy', 'Deleted term %name.', array('%name' => $this->taxonomy_term->label()), WATCHDOG_NOTICE);
+    $form_state['redirect'] = 'admin/structure/taxonomy';
+    Cache::invalidateTags(array('content' => TRUE));
+  }
+
+}
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyDelete.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyDelete.php
new file mode 100644
index 0000000..6f0d16a
--- /dev/null
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyDelete.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\taxonomy\Form\VocabularyDelete.
+ */
+
+namespace Drupal\taxonomy\Form;
+
+use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\taxonomy\Plugin\Core\Entity\Vocabulary;
+use Drupal\Core\Cache\Cache;
+
+/**
+ * Provides a deletion confirmation form for taxonomy vocabulary.
+ */
+class VocabularyDelete extends ConfirmFormBase {
+
+  /**
+   * The vocabulary being deleted.
+   *
+   * @var \Drupal\taxonomy\Plugin\Core\Entity\Vocabulary
+   */
+  protected $taxonomy_vocabulary;
+
+  /**
+   * Implements \Drupal\Core\Form\FormInterface::getFormID().
+   */
+  public function getFormID() {
+    return 'taxonomy_vocabulary_delete_form';
+  }
+
+  /**
+   * Implements \Drupal\Core\Form\ConfirmFormBase::getQuestion().
+   */
+  protected function getQuestion() {
+    return t('Are you sure you want to delete the vocabulary %title?', array('%title' => $this->taxonomy_vocabulary->label()));
+  }
+
+  /**
+   * Implements \Drupal\Core\Form\ConfirmFormBase::getCancelPath().
+   */
+  protected function getCancelPath() {
+    return 'admin/structure/taxonomy';
+  }
+
+  /**
+   * Overrides \Drupal\Core\Form\ConfirmFormBase::getDescription().
+   */
+  protected function getDescription() {
+    return t('Deleting a vocabulary will delete all the terms in it. This action cannot be undone.');
+  }
+
+  /**
+   * Overrides \Drupal\Core\Form\ConfirmFormBase::getConfirmText().
+   */
+  protected function getConfirmText() {
+    return t('Delete');
+  }
+
+  /**
+   * Overrides \Drupal\Core\Form\ConfirmFormBase::buildForm().
+   */
+  public function buildForm(array $form, array &$form_state, Vocabulary $taxonomy_vocabulary = NULL) {
+    $this->taxonomy_vocabulary = $taxonomy_vocabulary;
+    return parent::buildForm($form, $form_state);
+  }
+
+  /**
+   * Implements \Drupal\Core\Form\FormInterface::submitForm().
+   */
+  public function submitForm(array &$form, array &$form_state) {
+    $this->taxonomy_vocabulary->delete();
+    drupal_set_message(t('Deleted vocabulary %name.', array('%name' => $this->taxonomy_vocabulary->label())));
+    watchdog('taxonomy', 'Deleted vocabulary %name.', array('%name' => $this->taxonomy_vocabulary->label()), WATCHDOG_NOTICE);
+    $form_state['redirect'] = 'admin/structure/taxonomy';
+    Cache::invalidateTags(array('content' => TRUE));
+  }
+
+}
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TaxonomyBundle.php b/core/modules/taxonomy/lib/Drupal/taxonomy/TaxonomyBundle.php
new file mode 100644
index 0000000..69376a5
--- /dev/null
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/TaxonomyBundle.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\taxonomy\TaxonomyBundle.
+ */
+
+namespace Drupal\taxonomy;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+/**
+ * Taxonomy dependency injection container.
+ */
+class TaxonomyBundle extends Bundle {
+
+  /**
+   * Overrides \Symfony\Component\HttpKernel\Bundle\Bundle::build().
+   */
+  public function build(ContainerBuilder $container) {
+    $container->register('access_check.taxonomy.term', 'Drupal\taxonomy\Access\TermDeleteAccessCheck')
+      ->addTag('access_check');
+    $container->register('access_check.taxonomy.vocabulary', 'Drupal\taxonomy\Access\VocabularyDeleteAccessCheck')
+      ->addTag('access_check');
+  }
+
+}
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php
index 6785335..ac358b3 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php
@@ -20,10 +20,6 @@ class VocabularyFormController extends EntityFormController {
    */
   public function form(array $form, array &$form_state, EntityInterface $vocabulary) {
 
-    // Check whether we need a deletion confirmation form.
-    if (isset($form_state['confirm_delete']) && isset($form_state['values']['vid'])) {
-      return taxonomy_vocabulary_confirm_delete($form, $form_state, $form_state['values']['vid']);
-    }
     $form['name'] = array(
       '#type' => 'textfield',
       '#title' => t('Name'),
@@ -84,27 +80,20 @@ public function form(array $form, array &$form_state, EntityInterface $vocabular
    * Returns an array of supported actions for the current entity form.
    */
   protected function actions(array $form, array &$form_state) {
-    // If we are displaying the delete confirmation skip the regular actions.
-    if (empty($form_state['confirm_delete'])) {
-      $actions = parent::actions($form, $form_state);
-      array_unshift($actions['delete']['#submit'], array($this, 'submit'));
-      // Add the language configuration submit handler. This is needed because
-      // the submit button has custom submit handlers.
-      if (module_exists('language')) {
-        array_unshift($actions['submit']['#submit'],'language_configuration_element_submit');
-        array_unshift($actions['submit']['#submit'], array($this, 'languageConfigurationSubmit'));
-      }
-      // We cannot leverage the regular submit handler definition because we
-      // have button-specific ones here. Hence we need to explicitly set it for
-      // the submit action, otherwise it would be ignored.
-      if (module_exists('translation_entity')) {
-        array_unshift($actions['submit']['#submit'], 'translation_entity_language_configuration_element_submit');
-      }
-      return $actions;
+    $actions = parent::actions($form, $form_state);
+    // Add the language configuration submit handler. This is needed because
+    // the submit button has custom submit handlers.
+    if (\Drupal::service('module_handler')->moduleExists('language')) {
+      //array_unshift($actions['submit']['#submit'], 'language_configuration_element_submit');
+      array_unshift($actions['submit']['#submit'], array($this, 'languageConfigurationSubmit'));
     }
-    else {
-      return array();
+    // We cannot leverage the regular submit handler definition because we
+    // have button-specific ones here. Hence we need to explicitly set it for
+    // the submit action, otherwise it would be ignored.
+    if (\Drupal::service('module_handler')->moduleExists('translation_entity')) {
+      //array_unshift($actions['submit']['#submit'], 'translation_entity_language_configuration_element_submit');
     }
+    return $actions;
   }
 
   /**
@@ -144,23 +133,6 @@ public function languageConfigurationSubmit(array &$form, array &$form_state) {
   }
 
   /**
-   * Overrides Drupal\Core\Entity\EntityFormController::submit().
-   */
-  public function submit(array $form, array &$form_state) {
-    // @todo We should not be calling taxonomy_vocabulary_confirm_delete() from
-    // within the form builder.
-    if ($form_state['triggering_element']['#value'] == t('Delete')) {
-      // Rebuild the form to confirm vocabulary deletion.
-      $form_state['rebuild'] = TRUE;
-      $form_state['confirm_delete'] = TRUE;
-      return NULL;
-    }
-    else {
-      return parent::submit($form, $form_state);
-    }
-  }
-
-  /**
    * Overrides Drupal\Core\Entity\EntityFormController::save().
    */
   public function save(array $form, array &$form_state) {
@@ -186,4 +158,13 @@ public function save(array $form, array &$form_state) {
     $form_state['values']['vid'] = $vocabulary->id();
     $form_state['vid'] = $vocabulary->id();
   }
+
+  /**
+   * Overrides Drupal\Core\Entity\EntityFormController::delete().
+   */
+  public function delete(array $form, array &$form_state) {
+    $entity = $this->getEntity($form_state);
+    $form_state['redirect'] = 'admin/structure/taxonomy/' . $entity->id() . '/delete';
+  }
+
 }
diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc
index 6305e48..5747ae0 100644
--- a/core/modules/taxonomy/taxonomy.admin.inc
+++ b/core/modules/taxonomy/taxonomy.admin.inc
@@ -548,87 +548,6 @@ function taxonomy_term_add($vocabulary) {
 }
 
 /**
- * Form builder for the term delete form.
- *
- * @ingroup forms
- * @see taxonomy_term_confirm_delete_submit()
- */
-function taxonomy_term_confirm_delete($form, &$form_state, Term $term) {
-  // Always provide entity id in the same form key as in the entity edit form.
-  $form['tid'] = array('#type' => 'value', '#value' => $term->tid);
-
-  $form_state['taxonomy']['vocabulary'] = taxonomy_vocabulary_load($term->bundle());;
-  $form['type'] = array('#type' => 'value', '#value' => 'term');
-  $form['name'] = array('#type' => 'value', '#value' => $term->name);
-  $form['vid'] = array('#type' => 'value', '#value' => $term->bundle());
-  $form['delete'] = array('#type' => 'value', '#value' => TRUE);
-  return confirm_form($form,
-    t('Are you sure you want to delete the term %title?',
-      array('%title' => $term->label())),
-    'admin/structure/taxonomy',
-    t('Deleting a term will delete all its children if there are any. This action cannot be undone.'),
-    t('Delete'),
-    t('Cancel'));
-}
-
-/**
- * Submit handler to delete a term after confirmation.
- *
- * @see taxonomy_term_confirm_delete()
- */
-function taxonomy_term_confirm_delete_submit($form, &$form_state) {
-  taxonomy_term_delete($form_state['values']['tid']);
-  taxonomy_check_vocabulary_hierarchy($form_state['taxonomy']['vocabulary'], $form_state['values']);
-  drupal_set_message(t('Deleted term %name.', array('%name' => $form_state['values']['name'])));
-  watchdog('taxonomy', 'Deleted term %name.', array('%name' => $form_state['values']['name']), WATCHDOG_NOTICE);
-  if (!isset($_GET['destination'])) {
-    $form_state['redirect'] = 'admin/structure/taxonomy';
-  }
-  cache_invalidate_tags(array('content' => TRUE));
-  return;
-}
-
-/**
- * Form builder for the vocabulary delete confirmation form.
- *
- * @ingroup forms
- * @see taxonomy_vocabulary_confirm_delete_submit()
- */
-function taxonomy_vocabulary_confirm_delete($form, &$form_state, $vid) {
-  $vocabulary = taxonomy_vocabulary_load($vid);
-
-  // Always provide entity id in the same form key as in the entity edit form.
-  $form['vid'] = array('#type' => 'value', '#value' => $vid);
-
-  $form_state['taxonomy']['vocabulary'] = $vocabulary;
-  $form['#id'] = 'taxonomy_vocabulary_confirm_delete';
-  $form['type'] = array('#type' => 'value', '#value' => 'vocabulary');
-  $form['name'] = array('#type' => 'value', '#value' => $vocabulary->name);
-  $form['#submit'] = array('taxonomy_vocabulary_confirm_delete_submit');
-  return confirm_form($form,
-    t('Are you sure you want to delete the vocabulary %title?',
-      array('%title' => $vocabulary->label())),
-    'admin/structure/taxonomy',
-    t('Deleting a vocabulary will delete all the terms in it. This action cannot be undone.'),
-    t('Delete'),
-    t('Cancel'));
-}
-
-/**
- * Submit handler to delete a vocabulary after confirmation.
- *
- * @see taxonomy_vocabulary_confirm_delete()
- */
-function taxonomy_vocabulary_confirm_delete_submit($form, &$form_state) {
-  $status = taxonomy_vocabulary_delete($form_state['values']['vid']);
-  drupal_set_message(t('Deleted vocabulary %name.', array('%name' => $form_state['values']['name'])));
-  watchdog('taxonomy', 'Deleted vocabulary %name.', array('%name' => $form_state['values']['name']), WATCHDOG_NOTICE);
-  $form_state['redirect'] = 'admin/structure/taxonomy';
-  cache_invalidate_tags(array('content' => TRUE));
-  return;
-}
-
-/**
  * Form builder to confirm resetting a vocabulary to alphabetical order.
  *
  * @ingroup forms
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 43d2ac8..7958760 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -304,13 +304,9 @@ function taxonomy_menu() {
   );
   $items['taxonomy/term/%taxonomy_term/delete'] = array(
     'title' => 'Delete',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('taxonomy_term_confirm_delete', 2),
-    'access callback' => 'entity_page_access',
-    'access arguments' => array(2, 'delete'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 20,
-    'file' => 'taxonomy.admin.inc',
+    'route_name' => 'taxonomy_term_delete',
   );
   $items['taxonomy/term/%taxonomy_term/feed'] = array(
     'title' => 'Taxonomy term',
@@ -354,6 +350,12 @@ function taxonomy_menu() {
     'type' => MENU_LOCAL_TASK,
     'file' => 'taxonomy.admin.inc',
   );
+  $items['admin/structure/taxonomy/%taxonomy_vocabulary/delete'] = array(
+    'title' => 'Delete',
+    'type' => MENU_LOCAL_TASK,
+    'weight' => 20,
+    'route_name' => 'taxonomy_vocabulary_delete',
+  );
 
   $items['admin/structure/taxonomy/%taxonomy_vocabulary/add'] = array(
     'title' => 'Add term',
diff --git a/core/modules/taxonomy/taxonomy.routing.yml b/core/modules/taxonomy/taxonomy.routing.yml
new file mode 100644
index 0000000..1439e2f
--- /dev/null
+++ b/core/modules/taxonomy/taxonomy.routing.yml
@@ -0,0 +1,13 @@
+taxonomy_term_delete:
+  pattern: '/taxonomy/term/{taxonomy_term}/delete'
+  defaults:
+    _form: '\Drupal\taxonomy\Form\TermDelete'
+  requirements:
+    _access_taxonomy_term_delete: 'TRUE'
+
+taxonomy_vocabulary_delete:
+  pattern: '/admin/structure/taxonomy/{taxonomy_vocabulary}/delete'
+  defaults:
+    _form: '\Drupal\taxonomy\Form\VocabularyDelete'
+  requirements:
+    _access_taxonomy_vocabulary_delete: 'TRUE'