--- token_node.inc      2009-09-28 14:52:59.495338527 -0700
+++ token_node.inc.new  2009-09-28 14:56:45.374245088 -0700
@@ -230,8 +230,6 @@
  *   An array of titles through the specified node
  */
 function _menu_titles($menu_link, $nid) {
-  $tree = menu_tree_all_data($menu_link['menu_name'], $menu_link);
-
   // Get mlid of all nodes in path - top-most parent to leaf node.
   $parents = array();
   for ($i = 1; $i < MENU_MAX_DEPTH; $i++) {
@@ -242,18 +240,9 @@

   // Build the titles in this hierarchy.
   $titles = array();
-  $current = array_shift($tree);
-  while ($current) {
-    if (in_array($current['link']['mlid'], $parents)) {
-      $titles[] = $current['link']['title'];
-      if ($current['link']['href'] == "node/". $nid) {
-        break;
-      }
-      // Go deeper in tree hierarchy.
-      $tree = $current['below'];
-    }
-    // Go to next sibling at same level in tree hierarchy.
-    $current = $tree ? array_shift($tree) : NULL;
+  foreach ($parents as $parent) {
+    $ml = menu_link_load($parent);
+    $titles[] = $ml['link_title'];
   }
   return $titles;
 }
