diff --git a/core/modules/views/src/EntityViewsData.php b/core/modules/views/src/EntityViewsData.php
index a4099b2..037a0b8 100644
--- a/core/modules/views/src/EntityViewsData.php
+++ b/core/modules/views/src/EntityViewsData.php
@@ -310,15 +310,6 @@ protected function mapSingleFieldViewsData($table, $field_name, $field_type, $co
     // @see https://www.drupal.org/node/2337515
     switch ($field_type) {
       // Special case a few field types.
-      case 'timestamp':
-      case 'created':
-      case 'changed':
-        $views_field['field']['id'] = 'date';
-        $views_field['argument']['id'] = 'date';
-        $views_field['filter']['id'] = 'date';
-        $views_field['sort']['id'] = 'date';
-        break;
-
       case 'language':
         $views_field['field']['id'] = 'field';
         $views_field['argument']['id'] = 'language';
diff --git a/core/modules/views/src/Plugin/views/field/Date.php b/core/modules/views/src/Plugin/views/field/Date.php
deleted file mode 100644
index 8857c1a..0000000
--- a/core/modules/views/src/Plugin/views/field/Date.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\views\Plugin\views\field\Date.
- */
-
-namespace Drupal\views\Plugin\views\field;
-
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\views\ResultRow;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Datetime\DateFormatter;
-
-/**
- * A handler to provide proper displays for dates.
- *
- * @ingroup views_field_handlers
- *
- * @ViewsField("date")
- */
-class Date extends FieldPluginBase {
-
-  /**
-   * The date formatter service.
-   *
-   * @var \Drupal\Core\Datetime\DateFormatter
-   */
-  protected $dateFormatter;
-
-  /**
-   * The date format storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $dateFormatStorage;
-
-  /**
-   * Constructs a new Date object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Datetime\DateFormatter $date_formatter
-   *   The date formatter service.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $date_format_storage
-   *   The date format storage.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, DateFormatter $date_formatter, EntityStorageInterface $date_format_storage) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-
-    $this->dateFormatter = $date_formatter;
-    $this->dateFormatStorage = $date_format_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('date.formatter'),
-      $container->get('entity.manager')->getStorage('date_format')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function defineOptions() {
-    $options = parent::defineOptions();
-
-    $options['date_format'] = array('default' => 'small');
-    $options['custom_date_format'] = array('default' => '');
-    $options['timezone'] = array('default' => '');
-
-    return $options;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-
-    $date_formats = array();
-    foreach ($this->dateFormatStorage->loadMultiple() as $machine_name => $value) {
-      $date_formats[$machine_name] = $this->t('@name format: @date', array('@name' => $value->label(), '@date' => $this->dateFormatter->format(REQUEST_TIME, $machine_name)));
-    }
-
-    $form['date_format'] = array(
-      '#type' => 'select',
-      '#title' => $this->t('Date format'),
-      '#options' => $date_formats + array(
-        'custom' => $this->t('Custom'),
-        'raw time ago' => $this->t('Time ago'),
-        'time ago' => $this->t('Time ago (with "ago" appended)'),
-        'raw time hence' => $this->t('Time hence'),
-        'time hence' => $this->t('Time hence (with "hence" appended)'),
-        'raw time span' => $this->t('Time span (future dates have "-" prepended)'),
-        'inverse time span' => $this->t('Time span (past dates have "-" prepended)'),
-        'time span' => $this->t('Time span (with "ago/hence" appended)'),
-      ),
-      '#default_value' => isset($this->options['date_format']) ? $this->options['date_format'] : 'small',
-    );
-    $form['custom_date_format'] = array(
-      '#type' => 'textfield',
-      '#title' => $this->t('Custom date format'),
-      '#description' => $this->t('If "Custom", see <a href="http://us.php.net/manual/en/function.date.php" target="_blank">the PHP docs</a> for date formats. Otherwise, enter the number of different time units to display, which defaults to 2.'),
-      '#default_value' => isset($this->options['custom_date_format']) ? $this->options['custom_date_format'] : '',
-    );
-    // Setup #states for all possible date_formats on the custom_date_format form element.
-    foreach (array('custom', 'raw time ago', 'time ago', 'raw time hence', 'time hence', 'raw time span', 'time span', 'raw time span', 'inverse time span', 'time span') as $custom_date_possible) {
-      $form['custom_date_format']['#states']['visible'][] = array(
-        ':input[name="options[date_format]"]' => array('value' => $custom_date_possible),
-      );
-    }
-    $form['timezone'] = array(
-      '#type' => 'select',
-      '#title' => $this->t('Timezone'),
-      '#description' => $this->t('Timezone to be used for date output.'),
-      '#options' => array('' => $this->t('- Default site/user timezone -')) + system_time_zones(FALSE),
-      '#default_value' => $this->options['timezone'],
-    );
-    foreach (array_merge(array('custom'), array_keys($date_formats)) as $timezone_date_formats) {
-      $form['timezone']['#states']['visible'][] = array(
-        ':input[name="options[date_format]"]' => array('value' => $timezone_date_formats),
-      );
-    }
-
-    parent::buildOptionsForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function render(ResultRow $values) {
-    $value = $this->getValue($values);
-    $format = $this->options['date_format'];
-    if (in_array($format, array('custom', 'raw time ago', 'time ago', 'raw time hence', 'time hence', 'raw time span', 'time span', 'raw time span', 'inverse time span', 'time span'))) {
-      $custom_format = $this->options['custom_date_format'];
-    }
-
-    if ($value) {
-      $timezone = !empty($this->options['timezone']) ? $this->options['timezone'] : NULL;
-      $time_diff = REQUEST_TIME - $value; // will be positive for a datetime in the past (ago), and negative for a datetime in the future (hence)
-      switch ($format) {
-        case 'raw time ago':
-          return $this->dateFormatter->formatInterval($time_diff, is_numeric($custom_format) ? $custom_format : 2);
-        case 'time ago':
-          return $this->t('%time ago', array('%time' => $this->dateFormatter->formatInterval($time_diff, is_numeric($custom_format) ? $custom_format : 2)));
-        case 'raw time hence':
-          return $this->dateFormatter->formatInterval(-$time_diff, is_numeric($custom_format) ? $custom_format : 2);
-        case 'time hence':
-          return $this->t('%time hence', array('%time' => $this->dateFormatter->formatInterval(-$time_diff, is_numeric($custom_format) ? $custom_format : 2)));
-        case 'raw time span':
-          return ($time_diff < 0 ? '-' : '') . $this->dateFormatter->formatInterval(abs($time_diff), is_numeric($custom_format) ? $custom_format : 2);
-        case 'inverse time span':
-          return ($time_diff > 0 ? '-' : '') . $this->dateFormatter->formatInterval(abs($time_diff), is_numeric($custom_format) ? $custom_format : 2);
-        case 'time span':
-          return $this->t(($time_diff < 0 ? '%time hence' : '%time ago'), array('%time' => $this->dateFormatter->formatInterval(abs($time_diff), is_numeric($custom_format) ? $custom_format : 2)));
-        case 'custom':
-          if ($custom_format == 'r') {
-            return format_date($value, $format, $custom_format, $timezone, 'en');
-          }
-          return format_date($value, $format, $custom_format, $timezone);
-        default:
-          return format_date($value, $format, '', $timezone);
-      }
-    }
-  }
-
-}