diff --git a/core/modules/system/config/schema/system.data_types.schema.yml b/core/modules/system/config/schema/system.data_types.schema.yml
index 15e4c63..7c5a420 100644
--- a/core/modules/system/config/schema/system.data_types.schema.yml
+++ b/core/modules/system/config/schema/system.data_types.schema.yml
@@ -78,25 +78,3 @@ filter:
     status:
       type: boolean
       label: 'Enabled'
-
-# Date format with name and pattern.
-date_format:
-  type: mapping
-  label: 'Date Format'
-  mapping:
-    name:
-      type: label
-      label: 'Name'
-    pattern:
-      type: mapping
-      label: 'Format string'
-      mapping:
-        php:
-          type: label
-          label: 'PHP date format'
-        intl:
-          type: label
-          label: 'International'
-    locked:
-      type: boolean
-      label: 'Locked'
diff --git a/core/modules/system/config/schema/system.schema.yml b/core/modules/system/config/schema/system.schema.yml
index d41d414..2a9c752 100644
--- a/core/modules/system/config/schema/system.schema.yml
+++ b/core/modules/system/config/schema/system.schema.yml
@@ -90,12 +90,45 @@ system.date:
         default:
           type: string
           label: 'Default country'
-    formats:
+    langcode:
+      type: string
+      label: 'Default language'
+
+system.date_format.*:
+  type: mapping
+  label: 'Date format'
+  mapping:
+    id:
+      type: string
+      label: 'Date format identifier'
+    uuid:
+      type: string
+      label: 'UUID'
+    label:
+      type: label
+      label: 'Date format label'
+    status:
+      type: boolean
+      label: 'Enabled'
+    locked:
+      type: boolean
+      label: 'Locked'
+    locales:
       type: sequence
-      label: 'Date formats'
+      label: 'Select localizations'
       sequence:
-        - type: date_format
-          label: 'Date format'
+        - type: string
+          label: 'Language'
+    pattern:
+      type: mapping
+      label: 'Format string'
+      mapping:
+        php:
+          type: string
+          label: 'PHP date format'
+        intl:
+          type: string
+          label: 'Intl date format'
     langcode:
       type: string
       label: 'Default language'