diff --git a/ChangeLog b/ChangeLog
index 8e98e3e54..3f85a6bc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+jilles      2007/02/01 00:34:33 UTC	(20070201-3179)
+  Log:
+  Remove server_exists() which checked whether the
+  server name existed taking hostmasking into account
+  and just check with find_server(); admittedly
+  this checks if the name is a SID but that's not
+  a real problem.
+  
+
+  Changes:	Modified:
+  +3 -27	trunk/modules/core/m_server.c (File Modified) 
+
+
 jilles      2007/02/01 00:19:14 UTC	(20070201-3177)
   Log:
   Remove hash_find_masked_server(), which made it possible
diff --git a/include/serno.h b/include/serno.h
index 15bdbd1e2..df9d55446 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070201-3177"
+#define SERNO "20070201-3179"
diff --git a/modules/m_pong.c b/modules/m_pong.c
index 7900f48bb..f1a64cf81 100644
--- a/modules/m_pong.c
+++ b/modules/m_pong.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_pong.c 522 2006-01-15 20:55:27Z jilles $
+ *  $Id: m_pong.c 3181 2007-02-01 00:49:07Z jilles $
  */
 
 #include "stdinc.h"
@@ -49,7 +49,7 @@ struct Message pong_msgtab = {
 };
 
 mapi_clist_av1 pong_clist[] = { &pong_msgtab, NULL };
-DECLARE_MODULE_AV1(pong, NULL, NULL, pong_clist, NULL, NULL, "$Revision: 522 $");
+DECLARE_MODULE_AV1(pong, NULL, NULL, pong_clist, NULL, NULL, "$Revision: 3181 $");
 
 static int
 ms_pong(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
@@ -69,8 +69,7 @@ ms_pong(struct Client *client_p, struct Client *source_p, int parc, const char *
 	if(!EmptyString(destination) && !match(destination, me.name) &&
 	   irccmp(destination, me.id))
 	{
-		if((target_p = find_client(destination)) || 
-		   (target_p = find_server(NULL, destination)))
+		if((target_p = find_client(destination)))
 			sendto_one(target_p, ":%s PONG %s %s", 
 				   get_id(source_p, target_p), parv[1], 
 				   get_id(target_p, target_p));
diff --git a/src/s_serv.c b/src/s_serv.c
index e4869dc10..8ea6c667f 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_serv.c 2723 2006-11-09 23:35:48Z jilles $
+ *  $Id: s_serv.c 3181 2007-02-01 00:49:07Z jilles $
  */
 
 #include "stdinc.h"
@@ -280,10 +280,6 @@ hunt_server(struct Client *client_p, struct Client *source_p,
 		if(target_p->from == source_p->from && !MyConnect(target_p))
 			target_p = NULL;
 
-	if(target_p == NULL && (target_p = find_server(source_p, new)))
-		if(target_p->from == source_p->from && !MyConnect(target_p))
-			target_p = NULL;
-
 	collapse(new);
 	wilds = (strchr(new, '?') || strchr(new, '*'));