diff --git a/core/modules/node/config/schema/node.views.schema.yml b/core/modules/node/config/schema/node.views.schema.yml
index 70c5c23..85b9663 100644
--- a/core/modules/node/config/schema/node.views.schema.yml
+++ b/core/modules/node/config/schema/node.views.schema.yml
@@ -73,6 +73,14 @@ views.argument_default.node:
     type: string
     label: 'Nid'
 
+views.argument_default.node_created:
+  type: boolean
+  label: 'Current node created time'
+
+views.argument_default.node_changed:
+  type: boolean
+  label: 'Current node changed time'
+
 views.argument_validator.node:
   type: mapping
   label: 'Content'
diff --git a/core/modules/node/src/Plugin/views/argument_default/NodeChanged.php b/core/modules/node/src/Plugin/views/argument_default/NodeChanged.php
new file mode 100644
index 0000000..b1d36e6
--- /dev/null
+++ b/core/modules/node/src/Plugin/views/argument_default/NodeChanged.php
@@ -0,0 +1,113 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\node\Plugin\views\argument_default\NodeChanged.
+ */
+
+namespace Drupal\node\Plugin\views\argument_default;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheableDependencyInterface;
+use Drupal\Core\Datetime\DateFormatterInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\node\NodeInterface;
+use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * The current node changed argument default handler.
+ *
+ * @ingroup views_argument_default_plugins
+ *
+ * @ViewsArgumentDefault(
+ *   id = "node_changed",
+ *   title = @Translation("Current node changed time")
+ * )
+ */
+class NodeChanged extends ArgumentDefaultPluginBase implements CacheableDependencyInterface {
+
+  /**
+   * The route match.
+   *
+   * @var \Drupal\Core\Routing\RouteMatchInterface
+   */
+  protected $routeMatch;
+
+  /**
+   * The date formatter service.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatterInterface
+   */
+  protected $dateFormatter;
+
+  /**
+   * Constructs a new NodeChanged 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.
+   * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
+   *   The date formatter service.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, RouteMatchInterface $route_match, DateFormatterInterface $date_formatter) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+
+    $this->routeMatch = $route_match;
+    $this->dateFormatter = $date_formatter;
+  }
+
+  /**
+   * {@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'),
+      $container->get('date.formatter')
+    );
+  }
+
+  /**
+   * Return the current node changed time if a current node can be found.
+   */
+  public function getArgument() {
+    if (($node = $this->routeMatch->getParameter('node')) && $node instanceof NodeInterface) {
+      $argument = $this->argument;
+
+      // The Date argument handlers provide their own format strings, otherwise
+      // use a default.
+      if ($argument instanceof \Drupal\views\Plugin\views\argument\Date) {
+        /** @var \Drupal\views\Plugin\views\argument\Date $argument */
+        $format = $argument->getArgFormat();
+      }
+      else {
+        $format = 'Y-m-d';
+      }
+
+      return $this->dateFormatter->format($node->getChangedTime(), 'custom', $format);
+    }
+    return FALSE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheContexts() {
+    return ['url'];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge() {
+    return Cache::PERMANENT;
+  }
+}
diff --git a/core/modules/node/src/Plugin/views/argument_default/NodeCreated.php b/core/modules/node/src/Plugin/views/argument_default/NodeCreated.php
new file mode 100644
index 0000000..ca26d23
--- /dev/null
+++ b/core/modules/node/src/Plugin/views/argument_default/NodeCreated.php
@@ -0,0 +1,113 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\node\Plugin\views\argument_default\NodeCreated.
+ */
+
+namespace Drupal\node\Plugin\views\argument_default;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheableDependencyInterface;
+use Drupal\Core\Datetime\DateFormatterInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\node\NodeInterface;
+use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * The current node created argument default handler.
+ *
+ * @ingroup views_argument_default_plugins
+ *
+ * @ViewsArgumentDefault(
+ *   id = "node_created",
+ *   title = @Translation("Current node created time")
+ * )
+ */
+class NodeCreated extends ArgumentDefaultPluginBase implements CacheableDependencyInterface {
+
+  /**
+   * The route match.
+   *
+   * @var \Drupal\Core\Routing\RouteMatchInterface
+   */
+  protected $routeMatch;
+
+  /**
+   * The date formatter service.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatterInterface
+   */
+  protected $dateFormatter;
+
+  /**
+   * Constructs a new NodeCreated 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.
+   * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
+   *   The date formatter service.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, RouteMatchInterface $route_match, DateFormatterInterface $date_formatter) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+
+    $this->routeMatch = $route_match;
+    $this->dateFormatter = $date_formatter;
+  }
+
+  /**
+   * {@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'),
+      $container->get('date.formatter')
+    );
+  }
+
+  /**
+   * Return the current node creation time if a current node can be found.
+   */
+  public function getArgument() {
+    if (($node = $this->routeMatch->getParameter('node')) && $node instanceof NodeInterface) {
+      $argument = $this->argument;
+
+      // The Date argument handlers provide their own format strings, otherwise
+      // use a default.
+      if ($argument instanceof \Drupal\views\Plugin\views\argument\Date) {
+        /** @var \Drupal\views\Plugin\views\argument\Date $argument */
+        $format = $argument->getArgFormat();
+      }
+      else {
+        $format = 'Y-m-d';
+      }
+
+      return $this->dateFormatter->format($node->getCreatedTime(), 'custom', $format);
+    }
+    return FALSE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheContexts() {
+    return ['url'];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge() {
+    return Cache::PERMANENT;
+  }
+}
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 16b23fc..679b2de 100644
--- a/core/modules/views/config/schema/views.argument_default.schema.yml
+++ b/core/modules/views/config/schema/views.argument_default.schema.yml
@@ -1,5 +1,9 @@
 # Schema for the views default arguments.
 
+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/Date.php b/core/modules/views/src/Plugin/views/argument/Date.php
index d5b0b34..ad3287e 100644
--- a/core/modules/views/src/Plugin/views/argument/Date.php
+++ b/core/modules/views/src/Plugin/views/argument/Date.php
@@ -7,11 +7,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;
 
 /**
  * Abstract argument handler for dates.
@@ -39,87 +35,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';
 
-  var $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'] += array('date' => $this->t('Current date'));
-    $form['default_argument_type']['#options'] += array('node_created' => $this->t("Current node's creation time"));
-    $form['default_argument_type']['#options'] += array('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'], array('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}
    */
@@ -135,4 +56,13 @@ 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/src/Plugin/views/argument_default/Date.php b/core/modules/views/src/Plugin/views/argument_default/Date.php
new file mode 100644
index 0000000..72baab0
--- /dev/null
+++ b/core/modules/views/src/Plugin/views/argument_default/Date.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\views\Plugin\views\argument_default\Date.
+ */
+
+namespace Drupal\views\Plugin\views\argument_default;
+
+use Drupal\Core\Cache\CacheableDependencyInterface;
+use Drupal\Core\Datetime\DateFormatterInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * The current date argument default handler.
+ *
+ * @ingroup views_argument_default_plugins
+ *
+ * @ViewsArgumentDefault(
+ *   id = "date",
+ *   title = @Translation("Current date")
+ * )
+ */
+class Date extends ArgumentDefaultPluginBase implements CacheableDependencyInterface {
+
+  /**
+   * The date formatter service.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatterInterface
+   */
+  protected $dateFormatter;
+
+  /**
+   * The current Request object.
+   *
+   * @var \Symfony\Component\HttpFoundation\Request
+   */
+  protected $request;
+
+  /**
+   * 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\Datetime\DateFormatterInterface $date_formatter
+   *   The date formatter service.
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   The current request.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, DateFormatterInterface $date_formatter, Request $request) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+
+    $this->dateFormatter = $date_formatter;
+    $this->request = $request;
+  }
+
+  /**
+   * {@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('request_stack')->getCurrentRequest()
+    );
+  }
+
+  /**
+   * Return the default argument.
+   */
+  public function getArgument() {
+    $argument = $this->argument;
+
+    // The Date argument handlers provide their own format strings, otherwise
+    // use a default.
+    if ($argument instanceof \Drupal\views\Plugin\views\argument\Date) {
+      /** @var \Drupal\views\Plugin\views\argument\Date $argument */
+      $format = $argument->getArgFormat();
+    }
+    else {
+      $format = 'Y-m-d';
+    }
+
+    $request_time = $this->request->server->get('REQUEST_TIME');
+
+    return $this->dateFormatter->format($request_time, 'custom', $format);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheContexts() {
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge() {
+    return 0;
+  }
+}
diff --git a/core/modules/views/src/Tests/Plugin/ArgumentDefaultTest.php b/core/modules/views/src/Tests/Plugin/ArgumentDefaultTest.php
index 3f99ac1..518d0ee 100644
--- a/core/modules/views/src/Tests/Plugin/ArgumentDefaultTest.php
+++ b/core/modules/views/src/Tests/Plugin/ArgumentDefaultTest.php
@@ -23,7 +23,7 @@ class ArgumentDefaultTest extends PluginTestBase {
    *
    * @var array
    */
-  public static $testViews = array('test_view', 'test_argument_default_fixed', 'test_argument_default_current_user');
+  public static $testViews = array('test_view', 'test_argument_default_fixed', 'test_argument_default_current_user', 'test_argument_default_date');
 
   /**
    * Modules to enable.
@@ -123,6 +123,23 @@ function testArgumentDefaultFixed() {
   }
 
   /**
+   * Tests current date default argument.
+   */
+  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/modules/views_test_config/test_views/views.view.test_argument_default_date.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_date.yml
new file mode 100644
index 0000000..ad74b84
--- /dev/null
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_date.yml
@@ -0,0 +1,64 @@
+langcode: und
+status: true
+dependencies:
+  module:
+    - node
+id: test_argument_default_date
+label: ''
+module: views
+description: ''
+tag: ''
+base_table: node_field_data
+base_field: nid
+core: '8'
+display:
+  default:
+    display_options:
+      access:
+        type: none
+      arguments:
+        'null':
+          default_action: default
+          default_argument_type: date
+          field: 'null'
+          id: 'null'
+          must_not_be: false
+          table: views
+          plugin_id: 'null'
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      fields:
+        title:
+          alter:
+            alter_text: false
+            ellipsis: true
+            html: false
+            make_link: false
+            strip_tags: false
+            trim: false
+            word_boundary: true
+          empty_zero: false
+          field: title
+          hide_empty: false
+          id: title
+          link_to_node: false
+          table: node_field_data
+          plugin_id: node
+          entity_type: node
+          entity_field: title
+      pager:
+        options:
+          id: 0
+          items_per_page: 10
+          offset: 0
+        type: full
+      style:
+        type: default
+      row:
+        type: fields
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: 0