diff --git a/Headers/Foundation/NSStream.h b/Headers/Foundation/NSStream.h
index 23420752b..029250f24 100644
--- a/Headers/Foundation/NSStream.h
+++ b/Headers/Foundation/NSStream.h
@@ -290,14 +290,6 @@ typedef enum {
 
 @end
 
-@protocol GSStreamListener
-/**
- * The delegate receives this message when streamEvent
- * has occurred on theStream.
- */
-- (void) stream: (NSStream *)theStream handleEvent: (NSStreamEvent)streamEvent;
-@end
-
 GS_EXPORT NSString * const NSStreamDataWrittenToMemoryStreamKey;
 GS_EXPORT NSString * const NSStreamFileCurrentOffsetKey;
 
@@ -318,6 +310,12 @@ GS_EXPORT NSString * const NSStreamSOCKSProxyVersion4;
 GS_EXPORT NSString * const NSStreamSOCKSProxyVersion5;
 GS_EXPORT NSString * const NSStreamSOCKSProxyVersionKey;
 
+/**
+ * Informal protocol for delegates of instance of the [NSStream] class.
+ */
+@interface	NSObject (NSStreamDelegate)
+- (void) stream: (NSStream*)sStream handleEvent: (NSStreamEvent)anEvent;
+@end
 
 #endif
 
diff --git a/Source/GSStream.m b/Source/GSStream.m
index 94764e0f5..9e9345613 100644
--- a/Source/GSStream.m
+++ b/Source/GSStream.m
@@ -370,7 +370,7 @@ static RunLoopEventType typeForStream(NSStream *aStream)
     }
   if (_delegateValid == YES)
     {
-      [(id <GSStreamListener>)_delegate stream: self handleEvent: event];
+      [_delegate stream: self handleEvent: event];
     }
 
   while ((current = [self streamStatus]) != last)
@@ -385,8 +385,7 @@ static RunLoopEventType typeForStream(NSStream *aStream)
 	  if (_delegateValid == YES)
 	    {
 	      event = NSStreamEventEndEncountered;
-	      [(id <GSStreamListener>)_delegate stream: self
-					   handleEvent: event];
+	      [_delegate stream: self handleEvent: event];
 	    }
 	}
       else if (current == NSStreamStatusError)
@@ -394,8 +393,7 @@ static RunLoopEventType typeForStream(NSStream *aStream)
 	  if (_delegateValid == YES)
 	    {
 	      event = NSStreamEventErrorOccurred;
-	      [(id <GSStreamListener>)_delegate stream: self
-					   handleEvent: event];
+	      [_delegate stream: self handleEvent: event];
 	    }
 	}
       else