diff --git a/features.module b/features.module
index 8b321d8..954f5a6 100644
--- a/features.module
+++ b/features.module
@@ -725,8 +725,9 @@ function features_get_info($type = 'module', $name = NULL, $reset = FALSE) {
         if (!empty($row->info['dependencies'])) {
           $components[] = 'dependencies';
         }
-        // Use array_intersect() to preserve the weight ordered list of
-        // components.
+        // Sort $components by component weight using array_intersect() because
+        // $all_to preserve is already ordered in features_get_components().
+        // @see features_get_components()
         $data['feature'][$row->name]->components = array_intersect($all_components, $components);
       }
       $data['module'][$row->name] = $row;
diff --git a/includes/features.ctools.inc b/includes/features.ctools.inc
index 387cece..1e719db 100644
--- a/includes/features.ctools.inc
+++ b/includes/features.ctools.inc
@@ -234,7 +234,7 @@ function _ctools_features_get_info($identifier = NULL, $reset = FALSE) {
   static $components;
   if (!isset($components) || $reset) {
     $components = array();
-    $modules = features_get_info();
+    $modules = system_rebuild_module_data();
     ctools_include('export');
     drupal_static('ctools_export_get_schemas', NULL, $reset);
     foreach (ctools_export_get_schemas_by_module() as $module => $schemas) {