diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 5b6f1144d..1483ee162 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -6,6 +6,8 @@
     http://www.plainblack.com/bugs/tracker/if-no-sysnopsis-exists-the-asset-inherits-the-parents#VVesdkBSTm3neKRaKCJxKw
  - fix: diskUsage.pl (perlDreamer Consulting, LLC)
     http://www.plainblack.com/bugs/tracker/diskusage.pl#tlMpeq3vzsd37pRHcz_NYg
+ - fix: Had to remove Fix: Thread template: next.url and previous.url
+   tmpl_vars are always defined because it was causing a performance problem.
  - fix: thread next/prev url (perlDreamer Consulting, LLC)
     http://www.plainblack.com/bugs/tracker/thread-next/prev-url/
  - fix: getLineage joinClass expects string, not array ref (perlDreamer Consulting, LLC)
diff --git a/lib/WebGUI/Asset/Post/Thread.pm b/lib/WebGUI/Asset/Post/Thread.pm
index 5b9a04f69..eb41ecc6d 100644
--- a/lib/WebGUI/Asset/Post/Thread.pm
+++ b/lib/WebGUI/Asset/Post/Thread.pm
@@ -900,10 +900,8 @@ sub view {
 	$p->appendTemplateVars($var);
         $var->{'add.url'} = $self->getParent->getNewThreadUrl;
  
-    my $next     = $self->getNextThread;
-    my $previous = $self->getPreviousThread;
-    $var->{"previous.url"} = $previous->getUrl if (defined $previous);
-    $var->{"next.url"}     = $next->getUrl     if (defined $next);
+    $var->{"previous.url"} = $self->getUrl("func=previousThread");
+    $var->{"next.url"}     = $self->getUrl("func=nextThread");
 
 	$var->{"search.url"} = $self->getParent->getSearchUrl;
         $var->{"collaboration.url"} = $self->getThread->getParent->getUrl;