diff --git a/includes/configuration.ctools.inc b/includes/configuration.ctools.inc
index ca6bef7..bc85fd2 100644
--- a/includes/configuration.ctools.inc
+++ b/includes/configuration.ctools.inc
@@ -22,7 +22,7 @@ foreach (_ctools_configuration_get_info() as $component => $info) {
     $code .= 'function ' . $component . '_configuration_revert($module, $module_name = "configuration") { return ctools_component_configuration_revert("' . $component . '", $module, $module_name); }';
   }
   if (!function_exists("configuration_check_{$component}")) {
-    $code .= 'function configuration_check_' . $component . '($identifier, $from_activestore = FALSE) { return ctools_configuration_check($identifier, $from_activestore); }';
+    $code .= 'function configuration_check_' . $component . '($identifier) { return ctools_configuration_check($identifier); }';
   }
   if (!function_exists("configuration_hash_{$component}")) {
     $code .= 'function configuration_hash_' . $component . '($identifier) { return ctools_configuration_hash($identifier); }';
@@ -361,6 +361,12 @@ function configuration_hash_page_manager_pages($identifier) {
 function ctools_configuration_check($identifier) {
   // Set a static variable that we can access across this request.
   $from_activestore = &drupal_static('configuration_from_activestore');
+  
+  /**
+   * @todo
+   * We need an observer for ctools components but this do the trick for now.
+   */
+  $from_activestore = TRUE;
 
   // The component name is the name of the function that called this function
   // after the string configuration_check_<component>