diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index 0d40af17cc..290e06dbcc 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -212,7 +212,11 @@ window to relative, absolute, or delta.
 =item Tools:Follow TCP Stream
 
 If you have a TCP packet selected, it will display the contents of the TCP
-data stream in a separate window.
+data stream in a separate window. This has the side-effect of leaving
+the list of packets in a filtered state; only those packets that make up
+the TCP stream are shown. You can revert to your old view by pressing
+ENTER in the display filter text box, thereby invoking your old
+display filter (or resetting it back to no display filter).
 
 =back
 
diff --git a/ethereal.c b/ethereal.c
index 5a788d0d74..5fbbea6958 100644
--- a/ethereal.c
+++ b/ethereal.c
@@ -1,6 +1,6 @@
 /* ethereal.c
  *
- * $Id: ethereal.c,v 1.106 1999/08/25 03:22:46 guy Exp $
+ * $Id: ethereal.c,v 1.107 1999/08/25 22:19:55 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -193,7 +193,6 @@ follow_stream_cb( GtkWidget *w, gpointer data ) {
   char      filename1[128+1];
   GtkWidget *streamwindow, *box, *text, *vscrollbar, *table;
   int        tmp_fd;
-  gchar     *old_dfilter;
 
   if( pi.ipproto == 6 ) {
     /* we got tcp so we can follow */
@@ -220,9 +219,6 @@ follow_stream_cb( GtkWidget *w, gpointer data ) {
       return;
     }
 
-    /* Save any display filter we currently have. */
-    old_dfilter = cf.dfilter;
-
     /* Create a new filter that matches all packets in the TCP stream,
        and set the display filter entry accordingly */
     reset_tcp_reassembly();
@@ -303,11 +299,6 @@ follow_stream_cb( GtkWidget *w, gpointer data ) {
     unlink( filename1 );
     data_out_file = NULL;
     gtk_widget_show( streamwindow );
-    if( cf.dfilter != NULL ) {
-      g_free( cf.dfilter );
-    }
-    cf.dfilter = old_dfilter;
-    filter_packets(&cf);
   } else {
     simple_dialog(ESD_TYPE_WARN, NULL,
       "Error following stream.  Please make\n"