diff --git a/src/user.c b/src/user.c
index 9292343a6..370e58366 100644
--- a/src/user.c
+++ b/src/user.c
@@ -217,21 +217,9 @@ int hunt_server(aClient *cptr, aClient *sptr, MessageTag *mtags, char *command,
 	saved = parv[server];
 	parv[server] = acptr->name;
 
-	if (mtags)
-	{
-		char *str = mtags_to_string(mtags, acptr);
-		char newcommand[512];
-		/* Update the format string */
-		snprintf(newcommand, sizeof(newcommand), "@%%s %s", command);
-		/* And do the sendto_one() */
-		sendto_one(acptr, mtags, newcommand, str, sptr->name,
-		    parv[1], parv[2], parv[3], parv[4],
-		    parv[5], parv[6], parv[7], parv[8]);
-	} else {
-		sendto_one(acptr, mtags, command, sptr->name,
-		    parv[1], parv[2], parv[3], parv[4],
-		    parv[5], parv[6], parv[7], parv[8]);
-	}
+	sendto_one(acptr, mtags, command, sptr->name,
+	    parv[1], parv[2], parv[3], parv[4],
+	    parv[5], parv[6], parv[7], parv[8]);
 
 	parv[server] = saved;