diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index ec55d09..7810d26 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -1003,18 +1003,12 @@ function theme($hook, $variables = array()) {
     $suggestions = $variables['theme_hook_suggestions'];
   }

-  $context = array();
-
-  // Provide theme IDs and suggestions via context if the base theme hook is the
-  // same as the original hook. Context is only needed if the original theme
-  // hook is not a theme hook suggestion.
-  if ($hook == $original_hook) {
-    $context += array(
-      '#theme_id' => $original_hook,
-      '#base_theme_id' => $hook,
-      '#suggestions' => $suggestions,
-    );
-  }
+  // Provide context for hooks.
+  $context = array(
+    '#theme_id' => $original_hook,
+    '#base_theme_id' => $hook,
+    '#suggestions' => $suggestions,
+  );

   $invoke_hooks = array(
     'theme_prepare',