diff --git a/modules/comment/comment.tokens.inc b/modules/comment/comment.tokens.inc
index e075c1296c8..60db70fab7b 100644
--- a/modules/comment/comment.tokens.inc
+++ b/modules/comment/comment.tokens.inc
@@ -180,11 +180,12 @@ function comment_tokens($type, $tokens, array $data = array(), array $options =
 
         // Comment related URLs.
         case 'url':
-          $replacements[$original] = url('comment/' . $comment->cid, array('absolute' => TRUE, 'fragment' => 'comment-' . $comment->cid));
+          $url_options['fragment']  = 'comment-' . $comment->cid;
+          $replacements[$original] = url('comment/' . $comment->cid, $url_options);
           break;
 
         case 'edit-url':
-          $replacements[$original] = url('comment/' . $comment->cid . '/edit', array('absolute' => TRUE));
+          $replacements[$original] = url('comment/' . $comment->cid . '/edit', $url_options);
           break;
 
         // Default values for the chained tokens handled below.
diff --git a/modules/node/node.tokens.inc b/modules/node/node.tokens.inc
index 06a46310ad0..a62190dbd27 100644
--- a/modules/node/node.tokens.inc
+++ b/modules/node/node.tokens.inc
@@ -163,11 +163,11 @@ function node_tokens($type, $tokens, array $data = array(), array $options = arr
           break;
 
         case 'url':
-          $replacements[$original] = url('node/' . $node->nid, array('absolute' => TRUE));
+          $replacements[$original] = url('node/' . $node->nid, $url_options);
           break;
 
         case 'edit-url':
-          $replacements[$original] = url('node/' . $node->nid . '/edit', array('absolute' => TRUE));
+          $replacements[$original] = url('node/' . $node->nid . '/edit', $url_options);
           break;
 
         // Default values for the chained tokens handled below.
diff --git a/modules/poll/poll.tokens.inc b/modules/poll/poll.tokens.inc
index 37d82ab0c55..6affdb74a4c 100644
--- a/modules/poll/poll.tokens.inc
+++ b/modules/poll/poll.tokens.inc
@@ -40,7 +40,6 @@ function poll_token_info() {
  * Implements hook_tokens().
  */
 function poll_tokens($type, $tokens, array $data = array(), array $options = array()) {
-  $url_options = array('absolute' => TRUE);
   $sanitize = !empty($options['sanitize']);
   $replacements = array();