diff --git a/commerce_fieldgroup_panes.module b/commerce_fieldgroup_panes.module
index c81d477..5c68b92 100644
--- a/commerce_fieldgroup_panes.module
+++ b/commerce_fieldgroup_panes.module
@@ -8,35 +8,31 @@
  */
 
 /**
- * Implements hook_commerce_checkout_pane_info_alter().
+ * Implements hook_commerce_checkout_pane_info().
  */
-function commerce_fieldgroup_panes_commerce_checkout_pane_info_alter(&$checkout_panes) {
-  
+function commerce_fieldgroup_panes_commerce_checkout_pane_info() {
+  $checkout_panes = array();
   $groups = field_group_info_groups('commerce_order', 'commerce_order', 'form', TRUE);
-  
+
   // Check if the $groups is an array and if it contains
   // at least one element. If not return no new
   // panel.
   if (!is_array($groups) || count($groups) <= 0) {
     return $checkout_panes;
   }
-  
-  // Iterate over the field groups and convert them into 
-  // checkout panels. By default the panels are not enabled. 
+
+  // Iterate over the field groups and convert them into
+  // checkout panels. By default the panels are not enabled.
   foreach ($groups as $type => $group) {
-    $defaults = array(
+    $checkout_panes['commerce_fieldgroup_pane__' . $group->identifier] = array(
       'name' => t('Order Fieldgroup') . ': ' . $group->label,
       'title' => $group->label,
       'base' => 'commerce_fieldgroup_panes_contents',
       'enabled' => FALSE,
     );
-    if (isset($checkout_panes['commerce_fieldgroup_pane__' . $group->identifier])) {
-      $checkout_panes['commerce_fieldgroup_pane__' . $group->identifier] += $defaults;
-    }
-    else {
-      $checkout_panes['commerce_fieldgroup_pane__' . $group->identifier] = $defaults;
-    }
   }
+
+  return $checkout_panes;
 }
 
 /**