diff --git a/ChangeLog b/ChangeLog
index 68fe86c689..9f6dd142d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-30  Wim Taymans  <wim.taymans@gmail.com>
+
+	* gst/mpegaudioparse/gstmpegaudioparse.c:
+	(gst_mp3parse_emit_frame):
+	Remove some more broken code, it seems to clip even when it should not.
+	See #491305.
+
 2007-10-30  Wim Taymans  <wim.taymans@gmail.com>
 
 	* gst/mpegaudioparse/gstmpegaudioparse.c:
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index 73e3860c31..0f8caf2232 100644
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -624,12 +624,6 @@ gst_mp3parse_emit_frame (GstMPEGAudioParse * mp3parse, guint size)
     ret = gst_pad_push (mp3parse->srcpad, outbuf);
   }
 
-  /* return unexpected when we run off the end of the segment */
-  if (GST_CLOCK_TIME_IS_VALID (mp3parse->segment.stop)
-      && mp3parse->next_ts >= mp3parse->segment.stop) {
-    GST_DEBUG_OBJECT (mp3parse, "returning unexpected");
-    ret = GST_FLOW_UNEXPECTED;
-  }
   return ret;
 }