diff --git a/Changes b/Changes
index 80040e45b..8a7758199 100644
--- a/Changes
+++ b/Changes
@@ -2691,3 +2691,4 @@ seen. gmtime warning still there
 - Updated the TRE library source to 0.6.3 (not yet used)
 - Updated the win32 TRE lib/dll to 0.6.4
 - Updated the TRE library source to 0.6.4 (yup, a release right after I do the last upgrade!)
+- Removed all the FLAGS_TS8 stuff (no longer used)
diff --git a/src/channel.c b/src/channel.c
index 15667d7da..0f753f64a 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1292,8 +1292,6 @@ CMD_FUNC(m_mode)
 		return 0;
 	}
 
-   /*	sptr->flags &= ~FLAGS_TS8; */
-
 	if (MyConnect(sptr))
 		clean_channelname(parv[1]);
 	if (check_channelmask(sptr, cptr, parv[1]))
@@ -3928,8 +3926,6 @@ CMD_FUNC(m_part)
 	char *commentx = (parc > 2 && parv[2]) ? parv[2] : NULL;
 	char *comment;
 
-  /*	sptr->flags &= ~FLAGS_TS8; */
-
 	if (parc < 2 || parv[1][0] == '\0')
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
@@ -4103,9 +4099,6 @@ CMD_FUNC(m_kick)
 	char *comment, *name, *p = NULL, *user, *p2 = NULL;
 	Membership *lp;
 
-
-   /*	sptr->flags &= ~FLAGS_TS8;  */
-
 	if (parc < 3 || *parv[1] == '\0')
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
diff --git a/src/s_serv.c b/src/s_serv.c
index 6ff8d34b3..60c467ae6 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -1028,7 +1028,6 @@ CMD_FUNC(m_server_remote)
 	add_server_to_table(acptr);
 	IRCstats.servers++;
 	(void)find_or_add(acptr->name);
-   /*	acptr->flags |= FLAGS_TS8; */
 	add_client_to_list(acptr);
 	(void)add_to_client_hash_table(acptr->name, acptr);
 	RunHook(HOOKTYPE_SERVER_CONNECT, acptr);
@@ -1145,7 +1144,6 @@ int	m_server_synch(aClient *cptr, long numeric, ConfigItem_link *aconf)
 #endif
 	if ((Find_uline(cptr->name)))
 		cptr->flags |= FLAGS_ULINE;
-  /*	cptr->flags |= FLAGS_TS8; */
 	nextping = TStime();
 	(void)find_or_add(cptr->name);
 #ifdef USE_SSL
diff --git a/src/s_user.c b/src/s_user.c
index 9e51d806f..bf2a6fae0 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -1060,7 +1060,7 @@ extern int register_user(aClient *cptr, aClient *sptr, char *nick, char *usernam
 			    "USER server wrong direction");
 		}
 		else
-			sptr->flags |= (acptr->flags /* & FLAGS_TS8 */);
+			sptr->flags |= acptr->flags;
 		/* *FINALL* this gets in ircd... -- Barubary */
 		/* We change this a bit .. */
 		if (IsULine(sptr->srvptr))