diff --git a/includes/webform.components.inc b/includes/webform.components.inc
index 0d34ffc..4dafc3e 100644
--- a/includes/webform.components.inc
+++ b/includes/webform.components.inc
@@ -888,20 +888,6 @@ function webform_component_list($node, $component_filter = NULL, $indent = TRUE,
     }
   }
 
-  // Remove groups that do not have any children.
-  $cid = 0;
-  $previous_cid = 0;
-  foreach ($options as $cid => $label) {
-    if (isset($node->webform['components'][$previous_cid]['type']) && webform_component_feature($node->webform['components'][$previous_cid]['type'], 'group') && webform_component_feature($node->webform['components'][$cid]['type'], 'group')) {
-      unset($options[$cid]);
-    }
-  }
-
-  // Remove the last item from the list if it's a group.
-  if ($cid && webform_component_feature($node->webform['components'][$cid]['type'], 'group')) {
-    unset($options[$cid]);
-  }
-
   // Convert page breaks into optgroups.
   if ($optgroups) {
     $grouped_options = $options;