diff --git a/ChangeLog b/ChangeLog
index c027f3f79..9be695087 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -110,6 +110,10 @@
      referencing who knows what. Prevent these accidents by NULLing some
      fields on remove and replace. This way, either a panic or segfault
      will be produced on the faulty operation.
+   - otto@cvs.openbsd.org 2005/10/24 20:25:14
+     [openbsd-compat/sys-queue.h]
+     Partly backout. NOLIST, used in LISTs is probably interfering.
+     requested by deraadt@
  - (djm) [regress/sftp-cmds.sh]
    Use more restrictive glob to pick up test files from /bin - some platforms
    ship broken symlinks there which could spoil the test.
@@ -3386,4 +3390,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4788 2007/10/26 06:42:18 djm Exp $
+$Id: ChangeLog,v 1.4789 2007/10/26 06:43:22 djm Exp $
diff --git a/openbsd-compat/sys-queue.h b/openbsd-compat/sys-queue.h
index ee2ce30bf..e5c5e2f9f 100644
--- a/openbsd-compat/sys-queue.h
+++ b/openbsd-compat/sys-queue.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: queue.h,v 1.28 2005/10/17 20:19:42 otto Exp $	*/
+/*	$OpenBSD: queue.h,v 1.29 2005/10/24 20:25:14 otto Exp $	*/
 /*	$NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $	*/
 
 /*
@@ -304,8 +304,6 @@ struct {								\
 		(elm)->field.le_next->field.le_prev =			\
 		    (elm)->field.le_prev;				\
 	*(elm)->field.le_prev = (elm)->field.le_next;			\
-	(elm)->field.le_prev = NULL; 					\
-	(elm)->field.le_next = NULL;					\
 } while (0)
 
 #define LIST_REPLACE(elm, elm2, field) do {				\