diff --git a/core/modules/system/system.tokens.inc b/core/modules/system/system.tokens.inc
index 31b8030cef874914352ab0b18791234b5ec2434a..a11f55d0c8f26f79f1b09f688f47c26245c59840 100644
--- a/core/modules/system/system.tokens.inc
+++ b/core/modules/system/system.tokens.inc
@@ -165,21 +165,11 @@ function system_tokens($type, $tokens, array $data, array $options, BubbleableMe
     foreach ($tokens as $name => $original) {
       switch ($name) {
         case 'short':
-          $date_format = DateFormat::load('short');
-          $bubbleable_metadata->addCacheableDependency($date_format);
-          $replacements[$original] = format_date($date, 'short', '', NULL, $langcode);
-          break;
-
         case 'medium':
-          $date_format = DateFormat::load('medium');
-          $bubbleable_metadata->addCacheableDependency($date_format);
-          $replacements[$original] = format_date($date, 'medium', '', NULL, $langcode);
-          break;
-
         case 'long':
-          $date_format = DateFormat::load('long');
+          $date_format = DateFormat::load($name);
           $bubbleable_metadata->addCacheableDependency($date_format);
-          $replacements[$original] = format_date($date, 'long', '', NULL, $langcode);
+          $replacements[$original] = format_date($date, $name, '', NULL, $langcode);
           break;
 
         case 'since':