diff --git a/core/modules/user/config/optional/views.view.user_admin_people.yml b/core/modules/user/config/optional/views.view.user_admin_people.yml
index 01a48e8..57dd4e4 100644
--- a/core/modules/user/config/optional/views.view.user_admin_people.yml
+++ b/core/modules/user/config/optional/views.view.user_admin_people.yml
@@ -558,8 +558,20 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          link_to_user: false
-          plugin_id: user_mail
+          click_sort_column: value
+          type: basic_string
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: 0
+          plugin_id: field
           entity_type: user
           entity_field: mail
       filters:
diff --git a/core/modules/user/config/schema/user.views.schema.yml b/core/modules/user/config/schema/user.views.schema.yml
index 16573f4..d42da98 100644
--- a/core/modules/user/config/schema/user.views.schema.yml
+++ b/core/modules/user/config/schema/user.views.schema.yml
@@ -83,10 +83,6 @@ views.field.user_link_edit:
   type: views.field.user_link
   label: 'User edit link'
 
-views.field.user_mail:
-  type: views_field_user
-  label: 'User language'
-
 views.field.user_name:
   type: views_field_user
   label: 'User name'
diff --git a/core/modules/user/src/Plugin/views/field/Mail.php b/core/modules/user/src/Plugin/views/field/Mail.php
deleted file mode 100644
index e933c0d..0000000
--- a/core/modules/user/src/Plugin/views/field/Mail.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\user\Plugin\views\field\Mail.
- */
-
-namespace Drupal\user\Plugin\views\field;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Drupal\views\ResultRow;
-
-/**
- * Field handler to provide access control for the email field.
- *
- * @ingroup views_field_handlers
- *
- * @ViewsField("user_mail")
- */
-class Mail extends User {
-
-  protected function defineOptions() {
-    $options = parent::defineOptions();
-    $options['link_to_user'] = array('default' => 'mailto');
-    return $options;
-  }
-
-  public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    parent::buildOptionsForm($form, $form_state);
-    $form['link_to_user'] = array(
-      '#title' => $this->t('Link this field'),
-      '#type' => 'radios',
-      '#options' => array(
-        0 => $this->t('No link'),
-        'user' => $this->t('To the user'),
-        'mailto' => $this->t("With a mailto:"),
-      ),
-      '#default_value' => $this->options['link_to_user'],
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function renderLink($data, ResultRow $values) {
-    parent::renderLink($data, $values);
-
-    if ($this->options['link_to_user'] == 'mailto') {
-      $this->options['alter']['make_link'] = TRUE;
-      $this->options['alter']['path'] = "mailto:" . $data;
-    }
-
-    return $data;
-  }
-
-}
diff --git a/core/modules/user/src/UserViewsData.php b/core/modules/user/src/UserViewsData.php
index 621da71..d47651c 100644
--- a/core/modules/user/src/UserViewsData.php
+++ b/core/modules/user/src/UserViewsData.php
@@ -86,7 +86,6 @@ public function getViewsData() {
 
     // Note that this field implements field level access control.
     $data['users_field_data']['mail']['help'] = t('Email address for a given user. This field is normally not shown to users, so be cautious when using it.');
-    $data['users_field_data']['mail']['field']['id'] = 'user_mail';
 
     $data['users_field_data']['langcode']['help'] = t('Original language of the user information');
     $data['users_field_data']['langcode']['help'] = t('Language of the translation of user information');