diff --git a/core/modules/node/config/schema/node.views.schema.yml b/core/modules/node/config/schema/node.views.schema.yml
index f959611..2d0d7c8 100644
--- a/core/modules/node/config/schema/node.views.schema.yml
+++ b/core/modules/node/config/schema/node.views.schema.yml
@@ -66,6 +66,14 @@ views.argument.node_vid:
       type: boolean
       label: 'Exclude'
 
+views.argument_default.node_created:
+  type: sequence
+  label: 'Current node created time'
+
+views.argument_default.node_changed:
+  type: sequence
+  label: 'Current node changed time'
+
 views.field.node:
   type: views_field
   label: 'Node'
diff --git a/core/modules/views/config/schema/views.argument_default.schema.yml b/core/modules/views/config/schema/views.argument_default.schema.yml
index 63fc232..223f3d2 100644
--- a/core/modules/views/config/schema/views.argument_default.schema.yml
+++ b/core/modules/views/config/schema/views.argument_default.schema.yml
@@ -4,6 +4,10 @@ views.argument_default.*:
   type: mapping
   label: 'Base default argument'
 
+views.argument_default.date:
+  type: boolean
+  label: 'Current date'
+
 views.argument_default.fixed:
   type: mapping
   label: 'Fixed'
diff --git a/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
index 3f14519..e01ea72 100644
--- a/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
+++ b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
@@ -1108,6 +1108,15 @@ public function getPlugin($type = 'argument_default', $name = NULL) {
       $options = isset($this->options[$options_name]) ? $this->options[$options_name] : [];
     }
 
+    if ($type == 'argument_default') {
+      // Default arguments don't necessarily need to be plugins, they can be
+      // handled in the getDefaultArgument() method of an argument also.
+      $plugin_definition = Views::pluginManager($type)->getDefinition($name, FALSE);
+      if (!$plugin_definition) {
+        return;
+      }
+    }
+
     $plugin = Views::pluginManager($type)->createInstance($name);
     if ($plugin) {
       $plugin->init($this->view, $this->displayHandler, $options);
diff --git a/core/modules/views/src/Plugin/views/argument/Date.php b/core/modules/views/src/Plugin/views/argument/Date.php
index a751d56..ab8a4a7 100644
--- a/core/modules/views/src/Plugin/views/argument/Date.php
+++ b/core/modules/views/src/Plugin/views/argument/Date.php
@@ -2,11 +2,7 @@
 
 namespace Drupal\views\Plugin\views\argument;
 
-use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\node\NodeInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Argument handler for dates.
@@ -34,87 +30,12 @@ class Date extends Formula implements ContainerFactoryPluginInterface {
   protected $format;
 
   /**
-   * The date format used in the query.
+   * The default date format used in the query.
    *
    * @var string
    */
   protected $argFormat = 'Y-m-d';
 
-  public $option_name = 'default_argument_date';
-
-  /**
-   * The route match.
-   *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
-   */
-  protected $routeMatch;
-
-  /**
-   * Constructs a new Date instance.
-   *
-   * @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\Routing\RouteMatchInterface $route_match
-   *   The route match.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, RouteMatchInterface $route_match) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-
-    $this->routeMatch = $route_match;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('current_route_match')
-    );
-  }
-
-  /**
-   * Add an option to set the default value to the current date.
-   */
-  public function defaultArgumentForm(&$form, FormStateInterface $form_state) {
-    parent::defaultArgumentForm($form, $form_state);
-    $form['default_argument_type']['#options'] += ['date' => $this->t('Current date')];
-    $form['default_argument_type']['#options'] += ['node_created' => $this->t("Current node's creation time")];
-    $form['default_argument_type']['#options'] += ['node_changed' => $this->t("Current node's update time")];
-  }
-
-  /**
-   * Set the empty argument value to the current date,
-   * formatted appropriately for this argument.
-   */
-  public function getDefaultArgument($raw = FALSE) {
-    if (!$raw && $this->options['default_argument_type'] == 'date') {
-      return date($this->argFormat, REQUEST_TIME);
-    }
-    elseif (!$raw && in_array($this->options['default_argument_type'], ['node_created', 'node_changed'])) {
-      $node = $this->routeMatch->getParameter('node');
-
-      if (!($node instanceof NodeInterface)) {
-        return parent::getDefaultArgument();
-      }
-      elseif ($this->options['default_argument_type'] == 'node_created') {
-        return date($this->argFormat, $node->getCreatedTime());
-      }
-      elseif ($this->options['default_argument_type'] == 'node_changed') {
-        return date($this->argFormat, $node->getChangedTime());
-      }
-    }
-
-    return parent::getDefaultArgument($raw);
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -130,4 +51,14 @@ public function getFormula() {
     return parent::getFormula();
   }
 
+  /**
+   * Returns the date format used in the query in a form usable by PHP.
+   *
+   * @return string
+   *   The date format used in the query.
+   */
+  public function getArgFormat() {
+    return $this->argFormat;
+  }
+
 }
diff --git a/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php b/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
index b3956de..a43649c 100644
--- a/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
@@ -29,6 +29,7 @@ class ArgumentDefaultTest extends ViewTestBase {
     'test_argument_default_current_user',
     'test_argument_default_node',
     'test_argument_default_query_param',
+    'test_argument_default_date',
     ];
 
   /**
@@ -129,6 +130,25 @@ public function testArgumentDefaultFixed() {
   }
 
   /**
+   * Tests current date default argument.
+   *
+   * @see \Drupal\views\Plugin\views\argument_default\Date
+   */
+  public function testArgumentDefaultDate() {
+    /** @var \Drupal\Core\Datetime\DateFormatterInterface $date_formatter */
+    $date_formatter = \Drupal::service('date.formatter');
+    $request_time = \Drupal::requestStack()->getCurrentRequest()->server->get('REQUEST_TIME');
+
+    $view = Views::getView('test_argument_default_date');
+    $view->setDisplay();
+    $view->initHandlers();
+
+    $expected = $date_formatter->format($request_time, 'custom', 'Y-m-d');
+
+    $this->assertEqual($view->argument['null']->getDefaultArgument(), $expected, 'Current date argument should be used by default.');
+  }
+
+  /**
    * @todo Test php default argument.
    */
   //function testArgumentDefaultPhp() {}
diff --git a/core/modules/views/tests/src/Kernel/Handler/ArgumentDateTest.php b/core/modules/views/tests/src/Kernel/Handler/ArgumentDateTest.php
index db26e11..30dda0c 100644
--- a/core/modules/views/tests/src/Kernel/Handler/ArgumentDateTest.php
+++ b/core/modules/views/tests/src/Kernel/Handler/ArgumentDateTest.php
@@ -316,4 +316,38 @@ public function testYearMonthHandler() {
     $this->assertIdenticalResultset($view, $expected, $this->columnMap);
   }
 
+  /**
+   * Tests the date default argument type on the CreatedFullDate handler.
+   */
+  function testDefaultValue() {
+    /** @var \Drupal\views\ViewEntityInterface $view */
+    $view = View::load('test_argument_date');
+    $display = &$view->getDisplay('default');
+    // Set the argument's default value to "Current date".
+    $display['display_options']['arguments']['date_fulldate']['default_action'] = 'default';
+    $display['display_options']['arguments']['date_fulldate']['default_argument_type'] = 'date';
+    $view->save();
+
+    $executable = $view->getExecutable();
+    $executable->getDisplay('default');
+    $this->executeView($executable);
+
+    $expected = [];
+    $this->assertIdenticalResultset($executable, $expected, $this->columnMap);
+    $executable->destroy();
+
+    // Change the creation date of item 5 to today.
+    $this->container->get('database')->update('views_test_data')
+      ->fields(['created' => REQUEST_TIME])
+      ->condition('id', 5)
+      ->execute();
+
+    // Verify that the 5th element is now shown.
+    $executable->setDisplay('default');
+    $this->executeView($executable);
+    $expected = [];
+    $expected[] = ['id' => 5];
+    $this->assertIdenticalResultset($executable, $expected, $this->columnMap);
+  }
+
 }
diff --git a/core/modules/views/views.post_update.php b/core/modules/views/views.post_update.php
index a278034..44dce82 100644
--- a/core/modules/views/views.post_update.php
+++ b/core/modules/views/views.post_update.php
@@ -201,3 +201,10 @@ function views_post_update_boolean_filter_values() {
 function views_post_update_grouped_filters() {
   // Empty update to cause a cache rebuild so that the schema changes are read.
 }
+
+/**
+ * Clear cache to add new date default arguments.
+ */
+function views_post_update_add_date_default_arguments() {
+  // Empty update to cause a cache rebuild so that schema additions are read.
+}