diff --git a/core/includes/form.inc b/core/includes/form.inc
index c1c82c1..89f5516 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -276,28 +276,6 @@ function template_preprocess_radios(&$variables) {
 }
 
 /**
- * Prepares variables for checkboxes templates.
- *
- * Default template: checkboxes.html.twig.
- *
- * @param array $variables
- *   An associative array containing:
- *   - element: An associative array containing the properties of the element.
- *     Properties used: #children, #attributes.
- */
-function template_preprocess_checkboxes(&$variables) {
-  $element = $variables['element'];
-  $variables['attributes'] = array();
-  if (isset($element['#id'])) {
-    $variables['attributes']['id'] = $element['#id'];
-  }
-  if (isset($element['#attributes']['title'])) {
-    $variables['attributes']['title'] = $element['#attributes']['title'];
-  }
-  $variables['children'] = $element['#children'];
-}
-
-/**
  * Prepares variables for vertical tabs templates.
  *
  * Default template: vertical-tabs.html.twig.
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 54b038b..63c3ded 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -1134,6 +1134,20 @@ function template_preprocess_container(&$variables) {
 }
 
 /**
+ * Prepares variables for checkboxes container templates.
+ *
+ * Default template: container--checkboxes.html.twig.
+ *
+ * @param array $variables
+ *   An associative array containing:
+ *   - element: An associative array containing the properties of the element.
+ *     Properties used: #id, #attributes, #children.
+ */
+function template_preprocess_container__checkboxes(&$variables) {
+  $variables['element']['#attributes']['class'][] = 'form-checkbox';
+}
+
+/**
  * Prepares variables for maintenance task list templates.
  *
  * Default template: maintenance-task-list.html.twig.
diff --git a/core/lib/Drupal/Core/Render/Element/Checkboxes.php b/core/lib/Drupal/Core/Render/Element/Checkboxes.php
index 117f839..59e0286 100644
--- a/core/lib/Drupal/Core/Render/Element/Checkboxes.php
+++ b/core/lib/Drupal/Core/Render/Element/Checkboxes.php
@@ -50,7 +50,7 @@ public function getInfo() {
       '#pre_render' => array(
         array($class, 'preRenderCompositeFormElement'),
       ),
-      '#theme_wrappers' => array('checkboxes'),
+      '#theme_wrappers' => array('container__checkboxes'),
     );
   }
 
diff --git a/core/modules/system/templates/checkboxes.html.twig b/core/modules/system/templates/checkboxes.html.twig
deleted file mode 100644
index 19209d9..0000000
--- a/core/modules/system/templates/checkboxes.html.twig
+++ /dev/null
@@ -1,17 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for a 'checkboxes' #type form element.
- *
- * Available variables
- * - attributes: A list of HTML attributes for the wrapper element.
- * - children: The rendered checkboxes.
- *
- * @see template_preprocess_checkboxes()
- *
- * @ingroup themeable
- */
- @todo: remove this file once https://www.drupal.org/node/1819284 is resolved.
- This is identical to core/modules/system/templates/container.html.twig
-#}
-<div{{ attributes.addClass('form-checkboxes') }}>{{ children }}</div>