diff --git a/krb5-1.4-null.patch b/krb5-1.4-null.patch
deleted file mode 100644
index d1e6833..0000000
--- a/krb5-1.4-null.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Screen out interfaces which have no address in foreach_localaddr().  (Per man
-pages for OpenBSD and OS/X, they are legal.)  If it doesn't have an address,
-the functions which call this function (src/kdc/network.c, which wants to
-listen on the interfaces, and src/lib/krb5/os/localaddr.c, which just wants a
-list of local addresses), have no use for it anyway.
-
-This is slightly different than the fix proposed by Paul Jakma at
-http://mailman.mit.edu/pipermail/krb5-bugs/2004-January/002152.html, but is
-more or less equivalent.
-
-Don't worry, printifaddr() already checks that ifp->ifa_addr != NULL before
-printing it.
-
---- krb5-1.4/src/lib/krb5/os/localaddr.c	2005-02-18 11:20:52.000000000 -0500
-+++ krb5-1.4/src/lib/krb5/os/localaddr.c	2005-02-18 11:23:52.000000000 -0500
-@@ -435,6 +435,8 @@
- #ifdef DEBUG
- 	printifaddr (ifp);
- #endif
-+	if (ifp->ifa_addr == NULL)
-+	    continue;
- 	if ((ifp->ifa_flags & IFF_UP) == 0)
- 	    continue;
- 	if (ifp->ifa_flags & IFF_LOOPBACK) {
-@@ -458,6 +460,8 @@
- 	/* If this address is a duplicate, punt.  */
- 	match = 0;
- 	for (ifp2 = ifp_head; ifp2 && ifp2 != ifp; ifp2 = ifp2->ifa_next) {
-+	    if (ifp2->ifa_addr == NULL)
-+		continue;
- 	    if ((ifp2->ifa_flags & IFF_UP) == 0)
- 		continue;
- 	    if (ifp2->ifa_flags & IFF_LOOPBACK)
diff --git a/krb5.spec b/krb5.spec
index e2a8d79..84aceeb 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -56,7 +56,6 @@ Patch16: krb5-1.6-buildconf.patch
 Patch18: krb5-1.2.7-reject-bad-transited.patch
 Patch21: krb5-selinux.patch
 Patch23: krb5-1.3.1-dns.patch
-Patch25: krb5-1.4-null.patch
 Patch26: krb5-1.3.2-efence.patch
 Patch27: krb5-1.3.3-rcp-sendlarge.patch
 Patch29: krb5-1.3.5-kprop-mktemp.patch
@@ -202,6 +201,11 @@ installed on systems which are meant provide these services.
 %endif
 
 %changelog
+* Mon Feb 25 2008 Nalin Dahyabhai <nalin@redhat.com>
+- remove a patch, to fix problems with interfaces which are "up" but which
+  have no address assigned, which conflicted with a different fix for the same
+  problem in 1.5 (#200979)
+
 * Wed Jan 23 2008 Nalin Dahyabhai <nalin@redhat.com> 1.6.1-7
 - backport fix from 1.6.3 to get back traditional prompt-for-password-change-
   on-expired-password behavior back in kinit (and other users of
@@ -1145,7 +1149,6 @@ popd
 %patch16 -p1 -b .buildconf
 %patch18 -p1 -b .reject-bad-transited
 %patch23 -p1 -b .dns
-%patch25 -p1 -b .null
 # Removes a malloc(0) case, nothing more.
 # %patch26 -p1 -b .efence
 %patch27 -p1 -b .rcp-sendlarge