diff --git a/ChangeLog b/ChangeLog
index 7dda41e197..2bf550009f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-02  Edward Hervey  <bilboed@bilboed.com>
+
+	* plugins/elements/gstqueue.c: (gst_queue_locked_enqueue),
+	(gst_queue_locked_dequeue):
+	Comment the segment-related code... in the PROPER function.
+	See #482147 and my commit from yesterday.
+
 2007-10-01  Wim Taymans  <wim.taymans@gmail.com>
 
 	* libs/gst/base/gstbasesrc.c: (gst_base_src_change_state):
diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c
index 6eb6ce4cbf..567c2660c4 100644
--- a/plugins/elements/gstqueue.c
+++ b/plugins/elements/gstqueue.c
@@ -631,8 +631,12 @@ gst_queue_locked_enqueue (GstQueue * queue, gpointer item)
 
     /* if this is the first buffer update the end side as well, but without the
      * duration. */
-    if (queue->cur_level.buffers == 1)
-      apply_buffer (queue, buffer, &queue->src_segment, FALSE);
+    /* FIXME : This will only be useful for current time level if the
+     * source task is running, which is not the case for ex in 
+     * gstplaybasebin when pre-rolling.
+     * See #482147 */
+    /*     if (queue->cur_level.buffers == 1) */
+    /*       apply_buffer (queue, buffer, &queue->src_segment, FALSE); */
   } else if (GST_IS_EVENT (item)) {
     GstEvent *event = GST_EVENT_CAST (item);
 
@@ -687,12 +691,8 @@ gst_queue_locked_dequeue (GstQueue * queue)
     apply_buffer (queue, buffer, &queue->src_segment, TRUE);
 
     /* if the queue is empty now, update the other side */
-    /* FIXME : This will only be useful for current time level if the
-     * source task is running, which is not the case for ex in 
-     * gstplaybasebin when pre-rolling.
-     * See #482147 */
-    /*     if (queue->cur_level.buffers == 0) */
-    /*       queue->cur_level.time = 0; */
+    if (queue->cur_level.buffers == 0)
+      queue->cur_level.time = 0;
   } else if (GST_IS_EVENT (item)) {
     GstEvent *event = GST_EVENT_CAST (item);