diff --git a/ChangeLog b/ChangeLog
index 3995298119..19ce2fe170 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-07  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* gst/rtp/gstrtpspeexdepay.c: (gst_rtp_speex_depay_init),
+	(gst_rtp_speex_depay_process):
+	* gst/rtp/gstrtpspeexdepay.h:
+	Revert last change: Only the jitterbuffer is able to convert RTP to
+	Gstreamer timestamps and normal (de)payloaders should simply copy it.
+	Reopens bug #541787.
+
 2008-07-07  Stefan Kost  <ensonic@users.sf.net>
 
 	* gst/rtp/gstrtpvrawdepay.c:
diff --git a/gst/rtp/gstrtpspeexdepay.c b/gst/rtp/gstrtpspeexdepay.c
index db6cbd537a..c18c5e227a 100644
--- a/gst/rtp/gstrtpspeexdepay.c
+++ b/gst/rtp/gstrtpspeexdepay.c
@@ -105,7 +105,6 @@ gst_rtp_speex_depay_init (GstRtpSPEEXDepay * rtpspeexdepay,
     GstRtpSPEEXDepayClass * klass)
 {
   GST_BASE_RTP_DEPAYLOAD (rtpspeexdepay)->clock_rate = 8000;
-  rtpspeexdepay->start_ts = 0;
 }
 
 static gint
@@ -203,15 +202,8 @@ gst_rtp_speex_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
       gst_rtp_buffer_get_marker (buf),
       gst_rtp_buffer_get_timestamp (buf), gst_rtp_buffer_get_seq (buf));
 
-  GstRtpSPEEXDepay *speexdepayload = GST_RTP_SPEEX_DEPAY (depayload);
-  /* apply correct timestamp from rtp packet */
+  /* nothing special to be done */
   outbuf = gst_rtp_buffer_get_payload_buffer (buf);
-  if (speexdepayload->start_ts == 0)
-    speexdepayload->start_ts = gst_rtp_buffer_get_timestamp (buf);
-  GST_BUFFER_TIMESTAMP (outbuf) =
-      gst_util_uint64_scale (GST_SECOND,
-      gst_rtp_buffer_get_timestamp (buf) - speexdepayload->start_ts,
-      depayload->clock_rate);
 
   return outbuf;
 }
diff --git a/gst/rtp/gstrtpspeexdepay.h b/gst/rtp/gstrtpspeexdepay.h
index 705886c8e0..4a76a633d1 100644
--- a/gst/rtp/gstrtpspeexdepay.h
+++ b/gst/rtp/gstrtpspeexdepay.h
@@ -37,7 +37,6 @@ typedef struct _GstRtpSPEEXDepayClass GstRtpSPEEXDepayClass;
 struct _GstRtpSPEEXDepay
 {
   GstBaseRTPDepayload depayload;
-  guint64 start_ts;
 };
 
 struct _GstRtpSPEEXDepayClass