diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index 46ee053..ebe80fd 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -187,7 +187,7 @@ function language_configuration_element_submit(&$form, FormStateInterface $form_
       // In case we are editing a bundle, we must check the new bundle name,
       // because e.g. hook_ENTITY_update fired before.
       $form_object = $form_state->getFormObject();
-      if ($form_object instanceof EntityForm && $form_object->getOperation() === 'edit') {
+      if ($form_object instanceof EntityForm && !$form_object->getEntity()->isNew()) {
         /** @var EntityForm $form_object */
         $entity = $form_object->getEntity();
         $entity_definition = Drupal::entityManager()->getDefinition($entityType);
diff --git a/core/modules/taxonomy/src/Entity/Vocabulary.php b/core/modules/taxonomy/src/Entity/Vocabulary.php
index b783383..e650551 100644
--- a/core/modules/taxonomy/src/Entity/Vocabulary.php
+++ b/core/modules/taxonomy/src/Entity/Vocabulary.php
@@ -23,7 +23,6 @@
  *     "list_builder" = "Drupal\taxonomy\VocabularyListBuilder",
  *     "form" = {
  *       "default" = "Drupal\taxonomy\VocabularyForm",
- *       "edit" = "Drupal\taxonomy\VocabularyForm",
  *       "reset" = "Drupal\taxonomy\Form\VocabularyResetForm",
  *       "delete" = "Drupal\taxonomy\Form\VocabularyDeleteForm"
  *     }
diff --git a/core/modules/taxonomy/taxonomy.routing.yml b/core/modules/taxonomy/taxonomy.routing.yml
index 8eb35ea..6fa970f 100644
--- a/core/modules/taxonomy/taxonomy.routing.yml
+++ b/core/modules/taxonomy/taxonomy.routing.yml
@@ -45,7 +45,7 @@ entity.taxonomy_vocabulary.add_form:
 entity.taxonomy_vocabulary.edit_form:
   path: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}'
   defaults:
-    _entity_form: 'taxonomy_vocabulary.edit'
+    _entity_form: 'taxonomy_vocabulary.default'
     _title_callback: '\Drupal\taxonomy\Controller\TaxonomyController::vocabularyTitle'
   requirements:
     _entity_access: 'taxonomy_vocabulary.update'