diff --git a/core/includes/form.inc b/core/includes/form.inc
index d602d54..6a60a3f 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -3171,32 +3171,6 @@ function form_pre_render_checkbox($element) {
 }
 
 /**
- * Returns HTML for a set of checkbox form elements.
- *
- * @param $variables
- *   An associative array containing:
- *   - element: An associative array containing the properties of the element.
- *     Properties used: #children, #attributes.
- *
- * @ingroup themeable
- */
-function theme_checkboxes($variables) {
-  $element = $variables['element'];
-  $attributes = array();
-  if (isset($element['#id'])) {
-    $attributes['id'] = $element['#id'];
-  }
-  $attributes['class'][] = 'form-checkboxes';
-  if (!empty($element['#attributes']['class'])) {
-    $attributes['class'] = array_merge($attributes['class'], $element['#attributes']['class']);
-  }
-  if (isset($element['#attributes']['title'])) {
-    $attributes['title'] = $element['#attributes']['title'];
-  }
-  return '<div' . new Attribute($attributes) . '>' . (!empty($element['#children']) ? $element['#children'] : '') . '</div>';
-}
-
-/**
  * Adds form element theming to an element if its title or description is set.
  *
  * This is used as a pre render function for checkboxes and radios.
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index ac42ea3..5cf2c43 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -458,7 +458,7 @@ function system_element_info() {
     '#input' => TRUE,
     '#process' => array('form_process_checkboxes'),
     '#pre_render' => array('form_pre_render_conditional_form_element'),
-    '#theme_wrappers' => array('checkboxes'),
+    '#theme_wrappers' => array('container'),
   );
   $types['checkbox'] = array(
     '#input' => TRUE,