diff --git a/include/struct.h b/include/struct.h
index e423430ea..884253a5a 100644
--- a/include/struct.h
+++ b/include/struct.h
@@ -303,7 +303,6 @@ typedef OperPermission (*OperClassEntryEvalCallback)(OperClassACLEntryVar* varia
 #define	FLAGS_LOCAL      0x0800	/* set for local clients */
 #define	FLAGS_GOTID      0x1000	/* successful ident lookup achieved */
 #define	FLAGS_DOID       0x2000	/* I-lines say must use ident return */
-#define	FLAGS_NONL       0x4000	/* No \n in buffer */
 #define FLAGS_NCALL      0x8000 /* Next call (don't ask...) */
 #define FLAGS_ULINE      0x10000	/* User/server is considered U-lined */
 #define FLAGS_SQUIT      0x20000	/* Server has been /squit by an oper */
@@ -427,7 +426,6 @@ typedef OperPermission (*OperClassEntryEvalCallback)(OperClassACLEntryVar* varia
 #define	SetAccess(x)		((x)->flags |= FLAGS_CHKACCESS); Debug((DEBUG_DEBUG, "SetAccess(%s)", (x)->name))
 #define SetOutgoing(x)		do { x->flags |= FLAGS_OUTGOING; } while(0)
 #define	DoingAuth(x)		((x)->flags & FLAGS_AUTH)
-#define	NoNewLine(x)		((x)->flags & FLAGS_NONL)
 #define IsDCCNotice(x)		((x)->flags & FLAGS_DCCNOTICE)
 #define SetDCCNotice(x)		do { x->flags |= FLAGS_DCCNOTICE; } while(0)
 #define SetRegNick(x)		((x)->umodes & UMODE_REGNICK)
diff --git a/src/s_bsd.c b/src/s_bsd.c
index 4c7ddcf6b..e7d6d9bf9 100644
--- a/src/s_bsd.c
+++ b/src/s_bsd.c
@@ -1353,7 +1353,8 @@ void read_packet(int fd, int revents, void *data)
 		cptr->local->lasttime = now;
 		if (cptr->local->lasttime > cptr->local->since)
 			cptr->local->since = cptr->local->lasttime;
-		cptr->flags &= ~(FLAGS_PINGSENT | FLAGS_NONL);
+		/* FIXME: Is this correct? I have my doubts. */
+		cptr->flags &= ~FLAGS_PINGSENT;
 
 		processdata = 1;
 		for (h = Hooks[HOOKTYPE_RAWPACKET_IN]; h; h = h->next)