diff --git a/core/modules/media/media.module b/core/modules/media/media.module
index e93a7f528039bcb8886db717429a9b481ef16535..f5fe78639ab871b569e58fa8fbfcfa489bfbb4de 100644
--- a/core/modules/media/media.module
+++ b/core/modules/media/media.module
@@ -9,6 +9,7 @@
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Field\FieldTypePluginManager;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Render\Element\RenderElement;
@@ -184,6 +185,9 @@ function media_field_ui_preconfigured_options_alter(array &$options, $field_type
   // Set the default formatter for media in entity reference fields to be the
   // "Rendered entity" formatter.
   if (!empty($options['media'])) {
+    $options['media']['description'] = t('Field to reference media. Allows uploading and selecting from uploaded media.');
+    $options['media']['weight'] = -25;
+    $options['media']['category'] = FieldTypePluginManager::DEFAULT_CATEGORY;
     $options['media']['entity_view_display']['type'] = 'entity_reference_entity_view';
   }
 }
@@ -210,11 +214,6 @@ function media_form_field_ui_field_storage_add_form_alter(&$form, FormStateInter
       '#markup' => $description_text,
     ];
   }
-
-  // Remove Media from the Reference group since it already exists as a field.
-  if ($form_state->getValue('selected_field_type') === 'reference') {
-    unset($form['group_field_options_wrapper']['fields']['field_ui:entity_reference:media']);
-  }
 }
 
 /**
diff --git a/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php b/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php
index 2fedf2d1f3998b1c952c80a02e6481f04cf31604..f8cd65faeb2c7237c6d4a5ffef776fac57f49469 100644
--- a/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php
+++ b/core/modules/media/tests/src/Functional/MediaUiFunctionalTest.php
@@ -27,7 +27,6 @@ class MediaUiFunctionalTest extends MediaFunctionalTestBase {
     'block',
     'media_test_source',
     'media',
-    'media_library',
   ];
 
   /**
diff --git a/core/modules/media_library/media_library.module b/core/modules/media_library/media_library.module
index 1ae387651ba2be89ca51dcc99e12c1bd4de7e5ca..d92028d77557eca47290c2d5b73d3369604079ae 100644
--- a/core/modules/media_library/media_library.module
+++ b/core/modules/media_library/media_library.module
@@ -10,7 +10,6 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\Core\Field\FieldTypePluginManager;
 use Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
@@ -351,9 +350,6 @@ function media_library_field_ui_preconfigured_options_alter(array &$options, $fi
   // Set the default field widget for media to be the Media library.
   if (!empty($options['media'])) {
     $options['media']['entity_form_display']['type'] = 'media_library_widget';
-    $options['media']['description'] = t('Field to reference media. Allows uploading and selecting from uploaded media.');
-    $options['media']['weight'] = -25;
-    $options['media']['category'] = FieldTypePluginManager::DEFAULT_CATEGORY;
   }
 }