diff --git a/hansel.actions.inc b/hansel.actions.inc
index 61f52d0..c11cc9c 100644
--- a/hansel.actions.inc
+++ b/hansel.actions.inc
@@ -24,7 +24,7 @@ function hansel_action_add_single_link_get_crumbs($arguments) {
     $title = $arguments['title'];
   }
   if (!empty($arguments['remove_tokens'])) {
-    $title = preg_replace('/\\[[a-z0-9_\\-]+\\]/si', '', $title);
+    //$title = preg_replace('/\\[[a-z0-9_\\-]+\\]/si', '', $title);
   }
   return array(
     array(
diff --git a/hansel.module b/hansel.module
index 91b1b53..5b72358 100644
--- a/hansel.module
+++ b/hansel.module
@@ -552,8 +552,8 @@ function hansel_get_breadcrumbs($test = FALSE) {
     // Strings are supported for legacy, but are deprecated.
     // Please note that tokens are not supported only on arrays.
     if (is_array($breadcrumbs[$i])) {
-      $breadcrumbs[$i]['title'] = hansel_replace_tokens($breadcrumbs[$i]['title'], $breadcrumbs[$i]);
-      $breadcrumbs[$i]['href'] = hansel_replace_tokens($breadcrumbs[$i]['href'], $breadcrumbs[$i]);
+      $breadcrumbs[$i]['title'] = hansel_replace_tokens($breadcrumbs[$i]['title'], $breadcrumbs[$i], $rules[$rid]->crumb_action_arguments['remove_tokens']);
+      $breadcrumbs[$i]['href'] = hansel_replace_tokens($breadcrumbs[$i]['href'], $breadcrumbs[$i], $rules[$rid]->crumb_action_arguments['remove_tokens']);
       $breadcrumbs[$i]['title'] = _hansel_trim($breadcrumbs[$i]['title']);
       switch ($breadcrumbs[$i]['href']) {
         case '<none>':
@@ -644,7 +644,7 @@ function hansel_get_themed_breadcrumbs($original_breadcrumbs) {
  * @param string $input
  * @return string
  */
-function hansel_replace_tokens($input, $token) {
+function hansel_replace_tokens($input, $token, $clear = FALSE) {
   global $user;
   // Statically cache token type and object
   static $token_type;
@@ -671,7 +671,7 @@ function hansel_replace_tokens($input, $token) {
       }
     }
     // Replace tokens using token module.
-    $input = token_replace($input, array($token_type => $token_object));
+    $input = token_replace($input, array($token_type => $token_object), array('clear' => $clear));
   }
 
   // Replace [arg-N] tokens