diff --git a/tbsetup/template_swapin.in b/tbsetup/template_swapin.in
index 9a6cffa7bbf2fb504ac7df0d4c77fac51bd37b56..bd1b2ea0bccddef6e8a27b8962caf3a253dd0c5b 100644
--- a/tbsetup/template_swapin.in
+++ b/tbsetup/template_swapin.in
@@ -420,7 +420,7 @@ if (-e $cvsdir) {
     # records with this instance with the actual template.
     # The rlog check is so we can deal with old templates that have an
     # incomplete CVS repo.
-    System("$RLOG -h $cvsdir/$guid/setup/.template,v | ".
+    System("$RLOG -h $cvsdir/setup/.template,v | ".
 	   "  grep -q '${template_tag}:'");
     if (! $?) {
 	System("$CVSBIN -d $cvsdir rtag -n -r ".