diff --git a/configure.ac b/configure.ac
index 77f7a7e0..a33cbcc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -509,18 +509,6 @@ if test "$operchghost" = yes; then
 	AC_DEFINE(ENABLE_OPER_CHGHOST, 1, [Define this to enable opers to use the CHGHOST command.])
 fi
 
-dnl **********************************************************************
-dnl Enable ignoring of bogus timestamps
-dnl **********************************************************************
-
-AC_ARG_ENABLE(ignore-bogus-ts,
-AC_HELP_STRING([--enable-ignore-bogus-ts],[Enable the reset of timestamps in channels to current time if set to 0. Set this network wide or not at all.]),
-[ignorebogusts=$enableval],[ignorebogusts=no])
-
-if test "$ignorebogusts" = yes; then
-	AC_DEFINE(IGNORE_BOGUS_TS, 1, [Define this to enable the reset of timestamps in channels to current time if set to 0.])
-fi
-
 dnl Debug-related options
 dnl =====================
 
diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index a2e78917..d1785015 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -427,15 +427,6 @@ ms_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 	newts = atol(parv[1]);
 	oldts = chptr->channelts;
 
-#ifdef IGNORE_BOGUS_TS
-	if(newts < 800000000)
-	{
-		sendto_realops_snomask(SNO_DEBUG, L_ALL,
-				     "*** Bogus TS %ld on %s ignored from %s",
-				     (long) newts, chptr->chname, client_p->name);
-		newts = (oldts == 0) ? oldts : 800000000;
-	}
-#else
 	/* making a channel TS0 */
 	if(!isnew && !newts && oldts)
 	{
@@ -446,7 +437,6 @@ ms_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 				     "Server %s changing TS on %s from %ld to 0",
 				     source_p->name, chptr->chname, (long) oldts);
 	}
-#endif
 
 	if(isnew)
 		chptr->channelts = newts;
@@ -614,16 +604,6 @@ ms_sjoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 	oldts = chptr->channelts;
 	oldmode = &chptr->mode;
 
-#ifdef IGNORE_BOGUS_TS
-	if(newts < 800000000)
-	{
-		sendto_realops_snomask(SNO_DEBUG, L_ALL,
-				     "*** Bogus TS %ld on %s ignored from %s",
-				     (long) newts, chptr->chname, client_p->name);
-
-		newts = (oldts == 0) ? oldts : 800000000;
-	}
-#else
 	if(!isnew && !newts && oldts)
 	{
 		sendto_channel_local(ALL_MEMBERS, chptr,
@@ -634,7 +614,6 @@ ms_sjoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 				     "Server %s changing TS on %s from %ld to 0",
 				     source_p->name, chptr->chname, (long) oldts);
 	}
-#endif
 
 	if(isnew)
 		chptr->channelts = newts;
diff --git a/modules/m_version.c b/modules/m_version.c
index 597249a8..ba099fe6 100644
--- a/modules/m_version.c
+++ b/modules/m_version.c
@@ -139,9 +139,6 @@ confopts(void)
 
 	if(opers_see_all_users || ConfigFileEntry.operspy_dont_care_user_info)
 		*p++ = 'S';
-#ifdef IGNORE_BOGUS_TS
-	*p++ = 'T';
-#endif
 
 #ifdef HAVE_LIBZ
 	*p++ = 'Z';