diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 9500adf..d79a0b6 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -146,6 +146,7 @@ function system_theme() {
     ),
     'system_config_form' => array(
       'render element' => 'form',
+      'template' => 'system-config-form',
     ),
     'confirm_form' => array(
       'render element' => 'form',
@@ -2865,22 +2866,6 @@ function theme_confirm_form($variables) {
 }
 
 /**
- * Returns HTML for a system settings form.
- *
- * By default this does not alter the appearance of a form at all,
- * but is provided as a convenience for themers.
- *
- * @param $variables
- *   An associative array containing:
- *   - form: A render element representing the form.
- *
- * @ingroup themeable
- */
-function theme_system_config_form($variables) {
-  return drupal_render_children($variables['form']);
-}
-
-/**
  * Implements hook_admin_paths().
  */
 function system_admin_paths() {
diff --git a/core/modules/system/templates/system-config-form.html.twig b/core/modules/system/templates/system-config-form.html.twig
new file mode 100644
index 0000000..1b23972
--- /dev/null
+++ b/core/modules/system/templates/system-config-form.html.twig
@@ -0,0 +1,16 @@
+{#
+/**
+ * @file
+ * Template for system config form.
+ *
+ * This template will be used when a system config form specifies 'config_form'
+ * as its #theme callback.  Otherwise, by default, system config forms will be
+ * themed by theme_form().
+ *
+ * Available variables:
+ * - form: The confirm form.
+ *
+ * @ingroup themeable
+ */
+#}
+{{ form }}