diff --git a/ChangeLog b/ChangeLog
index ff70a59a88..0c736ca512 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-09-26  Michael Smith <msmith@fluendo.com>
+
+	* gst/gstbuffer.c: (gst_buffer_finalize):
+	  Make it once again possible to free GstBuffers in the default
+	  build.
+	  The poisoning scribbles on parts of the miniobject we need in
+	  order to free it.
+	  Fixes #480341
+
 2007-09-25  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* docs/gst/gstreamer-sections.txt:
diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c
index e7db9eaaf3..c553ac1034 100644
--- a/gst/gstbuffer.c
+++ b/gst/gstbuffer.c
@@ -192,10 +192,6 @@ gst_buffer_finalize (GstBuffer * buffer)
   g_free (buffer->malloc_data);
 
   gst_caps_replace (&GST_BUFFER_CAPS (buffer), NULL);
-
-#ifdef USE_POISONING
-  memset (buffer, 0xff, sizeof (GstBuffer));
-#endif
 }
 
 /**