diff --git a/Source/NSMessagePort.m b/Source/NSMessagePort.m
index 731c66310..a59308bfc 100644
--- a/Source/NSMessagePort.m
+++ b/Source/NSMessagePort.m
@@ -393,18 +393,10 @@ static Class	runLoopClass;
 	 type: ET_WDESC
       watcher: self
       forMode: NSConnectionReplyMode];
-  [l addEvent: (void*)(uintptr_t)desc
-	 type: ET_EDESC
-      watcher: self
-      forMode: NSConnectionReplyMode];
   [l addEvent: (void*)(uintptr_t)desc
 	 type: ET_WDESC
       watcher: self
       forMode: NSDefaultRunLoopMode];
-  [l addEvent: (void*)(uintptr_t)desc
-	 type: ET_EDESC
-      watcher: self
-      forMode: NSDefaultRunLoopMode];
 
   while (valid == YES && state == GS_H_TRYCON
     && [when timeIntervalSinceNow] > 0)
@@ -416,18 +408,10 @@ static Class	runLoopClass;
 	    type: ET_WDESC
 	 forMode: NSConnectionReplyMode
 	     all: NO];
-  [l removeEvent: (void*)(uintptr_t)desc
-	    type: ET_EDESC
-	 forMode: NSConnectionReplyMode
-	     all: NO];
   [l removeEvent: (void*)(uintptr_t)desc
 	    type: ET_WDESC
 	 forMode: NSDefaultRunLoopMode
 	     all: NO];
-  [l removeEvent: (void*)(uintptr_t)desc
-	    type: ET_EDESC
-	 forMode: NSDefaultRunLoopMode
-	     all: NO];
 
   if (state == GS_H_TRYCON)
     {
@@ -504,10 +488,6 @@ static Class	runLoopClass;
 		    type: ET_WDESC
 		 forMode: nil
 		     all: YES];
-	  [l removeEvent: (void*)(uintptr_t)desc
-		    type: ET_EDESC
-		 forMode: nil
-		     all: YES];
 	  NSDebugMLLog(@"NSMessagePort", @"invalidated 0x%x", self);
 	  [[self recvPort] removeHandle: self];
 	  [[self sendPort] removeHandle: self];
@@ -549,10 +529,6 @@ static Class	runLoopClass;
 		type: ET_WDESC
 	     forMode: mode
 		 all: YES];
-      [l removeEvent: data
-		type: ET_EDESC
-	     forMode: mode
-		 all: YES];
       return;
     }
 
@@ -1029,18 +1005,10 @@ static Class	runLoopClass;
 	 type: ET_WDESC
       watcher: self
       forMode: NSConnectionReplyMode];
-  [l addEvent: (void*)(uintptr_t)desc
-	 type: ET_EDESC
-      watcher: self
-      forMode: NSConnectionReplyMode];
   [l addEvent: (void*)(uintptr_t)desc
 	 type: ET_WDESC
       watcher: self
       forMode: NSDefaultRunLoopMode];
-  [l addEvent: (void*)(uintptr_t)desc
-	 type: ET_EDESC
-      watcher: self
-      forMode: NSDefaultRunLoopMode];
 
   while (valid == YES
     && [wMsgs indexOfObjectIdenticalTo: components] != NSNotFound
@@ -1055,18 +1023,10 @@ static Class	runLoopClass;
 	    type: ET_WDESC
 	 forMode: NSConnectionReplyMode
 	     all: NO];
-  [l removeEvent: (void*)(uintptr_t)desc
-	    type: ET_EDESC
-	 forMode: NSConnectionReplyMode
-	     all: NO];
   [l removeEvent: (void*)(uintptr_t)desc
 	    type: ET_WDESC
 	 forMode: NSDefaultRunLoopMode
 	     all: NO];
-  [l removeEvent: (void*)(uintptr_t)desc
-	    type: ET_EDESC
-	 forMode: NSDefaultRunLoopMode
-	     all: NO];
 
   if ([wMsgs indexOfObjectIdenticalTo: components] == NSNotFound)
     {
@@ -1673,7 +1633,6 @@ typedef	struct {
 
 	  if (type == ET_RDESC) t = "rdesc";
 	  else if (type == ET_WDESC) t = "wdesc";
-	  else if (type == ET_EDESC) t = "edesc";
 	  else if (type == ET_RPORT) t = "rport";
 	  else t = "unknown";
 	  NSLog(@"No handle for event %s on descriptor %d", t, desc);