Adding back two changes which got lost when merging consecutive dates

recurring_events.views.inc

@@ -55,4 +55,20 @@ function recurring_events_views_data_alter(array &$data) {
   if (!$set) {
     $data['eventinstance_field_data']['table']['base']['defaults']['field'] = 'id';
   }
+
+  // @todo Remove these declarations when
+  // https://www.drupal.org/project/drupal/issues/2489476 is resolved.
+  $data['eventinstance_field_data']['date__value']['filter']['id'] = 'datetime';
+  $data['eventinstance_field_data']['date__value']['filter']['field_name'] = 'date';
+  $data['eventinstance_field_data']['date__value']['sort']['id'] = 'datetime';
+  $data['eventinstance_field_data']['date__value']['sort']['field_name'] = 'date';
+  $data['eventinstance_field_data']['date__value']['argument']['id'] = 'datetime';
+  $data['eventinstance_field_data']['date__value']['argument']['field_name'] = 'date';
+
+  $data['eventinstance_field_data']['date__end_value']['filter']['id'] = 'datetime';
+  $data['eventinstance_field_data']['date__end_value']['filter']['field_name'] = 'date';
+  $data['eventinstance_field_data']['date__end_value']['sort']['id'] = 'datetime';
+  $data['eventinstance_field_data']['date__end_value']['sort']['field_name'] = 'date';
+  $data['eventinstance_field_data']['date__end_value']['argument']['id'] = 'datetime';
+  $data['eventinstance_field_data']['date__end_value']['argument']['field_name'] = 'date';
 }

src/Form/EventInstanceSettingsForm.php

@@ -60,7 +60,7 @@ class EventInstanceSettingsForm extends ConfigFormBase {
    *   Form definition array.
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $config = $this->config('recurring_events.eventseries.config');
+    $config = $this->config('recurring_events.eventinstance.config');
 
     $php_date_url = Url::fromUri('https://secure.php.net/manual/en/function.date.php');
     $php_date_link = Link::fromTextAndUrl($this->t('PHP date/time format'), $php_date_url);