diff --git a/ChangeLog b/ChangeLog
index 71e28d6729..cd9281630e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-14  Tim-Philipp Müller  <tim.muller at collabora co uk>
+
+	* gst/audioresample/gstaudioresample.c: (gst_audioresample_init):
+	  Revert previous change which made basetransform handle buffer_alloc
+	  and which breaks things badly in the non-passthrough case since it
+	  returned buffers with a different (ie. sometimes smaller) size than
+	  the size requested.
+
 2008-05-14  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	Patch by: Bernard B <b-gnome at largestprime dot net>
diff --git a/gst/audioresample/gstaudioresample.c b/gst/audioresample/gstaudioresample.c
index a36e688102..a8eb3fd121 100644
--- a/gst/audioresample/gstaudioresample.c
+++ b/gst/audioresample/gstaudioresample.c
@@ -192,6 +192,10 @@ gst_audioresample_init (GstAudioresample * audioresample,
 
   trans = GST_BASE_TRANSFORM (audioresample);
 
+  /* buffer alloc passthrough is too impossible. FIXME, it
+   * is trivial in the passthrough case. */
+  gst_pad_set_bufferalloc_function (trans->sinkpad, NULL);
+
   audioresample->filter_length = DEFAULT_FILTERLEN;
 
   audioresample->need_discont = FALSE;