diff --git a/ChangeLog b/ChangeLog
index fc7006fd3..c677f4293 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-15  Jonathan Matthew  <jonathan@d14n.org>
+
+	* backends/gstreamer/rb-player-gst-xfade.c: (create_stream):
+	Put the per-stream volume element back where it was.  Moving it breaks
+	fading out (mostly) and doesn't really fix the problem it was supposed
+	to fix.
+
 2008-12-10  Jonathan Matthew  <jonathan@d14n.org>
 
 	* backends/gstreamer/rb-player-gst-xfade.c: (start_stream_fade),
diff --git a/backends/gstreamer/rb-player-gst-xfade.c b/backends/gstreamer/rb-player-gst-xfade.c
index c0e885890..76eb23cd2 100644
--- a/backends/gstreamer/rb-player-gst-xfade.c
+++ b/backends/gstreamer/rb-player-gst-xfade.c
@@ -2200,8 +2200,8 @@ create_stream (RBPlayerGstXFade *player, const char *uri, gpointer stream_data,
 				  stream->audioconvert,
 				  stream->audioresample,
 				  stream->capsfilter,
-				  stream->volume,
 				  stream->preroll,
+				  stream->volume,
 				  NULL);
 		gst_element_link_many (stream->source,
 				       stream->queue,
@@ -2210,8 +2210,8 @@ create_stream (RBPlayerGstXFade *player, const char *uri, gpointer stream_data,
 		gst_element_link_many (stream->audioconvert,
 				       stream->audioresample,
 				       stream->capsfilter,
-				       stream->volume,
 				       stream->preroll,
+				       stream->volume,
 				       NULL);
 	} else {
 		gst_bin_add_many (GST_BIN (stream->bin),
@@ -2220,8 +2220,8 @@ create_stream (RBPlayerGstXFade *player, const char *uri, gpointer stream_data,
 				  stream->audioconvert,
 				  stream->audioresample,
 				  stream->capsfilter,
-				  stream->volume,
 				  stream->preroll,
+				  stream->volume,
 				  NULL);
 		gst_element_link_many (stream->source,
 				       stream->decoder,
@@ -2229,8 +2229,8 @@ create_stream (RBPlayerGstXFade *player, const char *uri, gpointer stream_data,
 		gst_element_link_many (stream->audioconvert,
 				       stream->audioresample,
 				       stream->capsfilter,
-				       stream->volume,
 				       stream->preroll,
+				       stream->volume,
 				       NULL);
 	}
 
@@ -2242,7 +2242,7 @@ create_stream (RBPlayerGstXFade *player, const char *uri, gpointer stream_data,
 
 		identity = gst_element_factory_make ("identity", NULL);
 		gst_bin_add (GST_BIN (stream->bin), identity);
-		gst_element_link (stream->preroll, identity);
+		gst_element_link (stream->volume, identity);
 		if (rb_debug_matches ("check-imperfect-timestamp", __FILE__)) {
 			g_object_set (identity, "check-imperfect-timestamp", TRUE, NULL);
 		}
@@ -2252,7 +2252,7 @@ create_stream (RBPlayerGstXFade *player, const char *uri, gpointer stream_data,
 
 		stream->src_pad = gst_element_get_pad (identity, "src");
 	} else {
-		stream->src_pad = gst_element_get_pad (stream->preroll, "src");
+		stream->src_pad = gst_element_get_pad (stream->volume, "src");
 	}
 
 	/* ghost the stream src pad up to the bin */