diff --git a/data/audio-profiles/mp3-lame.xml.in b/data/audio-profiles/mp3-lame.xml.in
index 38b078d..d9e09d9 100644
--- a/data/audio-profiles/mp3-lame.xml.in
+++ b/data/audio-profiles/mp3-lame.xml.in
@@ -30,10 +30,7 @@
                     (!= encoding_mode 0)
                     (gst-element-is-available "xingmux")) 
                         "xingmux" 
-                        "")
-                (if (gst-element-is-available "id3v2mux")
-                    "id3v2mux"
-                    "id3mux"))
+                        ""))
         ]]>
         </process>
         <variable id="encoding_mode">
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs
index 1dddc36..69192e3 100644
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer/AudioCdRipper.cs
@@ -140,7 +140,7 @@ namespace Banshee.GStreamer
             TrackReset ();
             current_track = track;
 
-            using (TagList tags = new TagList (track)) {
+            using (TagList tags = new TagList ()) {
                 output_path = String.Format ("{0}.{1}", outputUri.LocalPath, output_extension);
 
                 // Avoid overwriting an existing file
diff --git a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs
index 3ae0d57..70388ce 100644
--- a/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs
+++ b/src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs
@@ -151,34 +151,6 @@ namespace Banshee.GStreamerSharp
             output_path = null;
         }
 
-        private TagList MakeTagList (TrackInfo track)
-        {
-            TagList tags = new TagList ();
-
-            tags.Add (TagMergeMode.Replace, CommonTags.Artist, track.ArtistName);
-            tags.Add (TagMergeMode.Replace, CommonTags.Album, track.AlbumTitle);
-            tags.Add (TagMergeMode.Replace, CommonTags.Title, track.TrackTitle);
-            tags.Add (TagMergeMode.Replace, CommonTags.Genre, track.Genre);
-
-            tags.Add (TagMergeMode.Replace, CommonTags.TrackNumber, (uint)track.TrackNumber);
-            tags.Add (TagMergeMode.Replace, CommonTags.TrackCount, (uint)track.TrackCount);
-            tags.Add (TagMergeMode.Replace, CommonTags.AlbumDiscNumber, (uint)track.DiscNumber);
-            tags.Add (TagMergeMode.Replace, CommonTags.AlbumDiscCount, (uint)track.DiscCount);
-
-            tags.Add (TagMergeMode.Replace, CommonTags.Date, track.Year);
-            tags.Add (TagMergeMode.Replace, CommonTags.Date, track.ReleaseDate);
-
-            tags.Add (TagMergeMode.Replace, CommonTags.Composer, track.Composer);
-            tags.Add (TagMergeMode.Replace, CommonTags.Copyright, track.Copyright);
-            tags.Add (TagMergeMode.Replace, CommonTags.Comment, track.Comment);
-
-            tags.Add (TagMergeMode.Replace, CommonTags.MusicBrainzTrackId, track.MusicBrainzId);
-            tags.Add (TagMergeMode.Replace, CommonTags.MusicBrainzArtistId, track.ArtistMusicBrainzId);
-            tags.Add (TagMergeMode.Replace, CommonTags.MusicBrainzAlbumId, track.AlbumMusicBrainzId);
-
-            return tags;
-        }
-
         private GLib.GType ToGType (Type t)
         {
             return (GLib.GType)t;
@@ -190,7 +162,6 @@ namespace Banshee.GStreamerSharp
             TrackReset ();
             current_track = track;
 
-            TagList tags = MakeTagList (track);
             output_path = String.Format ("{0}.{1}", outputUri.LocalPath, output_extension);
 
             // Avoid overwriting an existing file
@@ -209,32 +180,6 @@ namespace Banshee.GStreamerSharp
             filesink.SetState (State.Null);
             filesink ["location"] = output_path;
 
-            var version = new System.Version (Banshee.ServiceStack.Application.Version);
-
-
-            // find an element to do the tagging and set tag data
-            foreach (Element element in encoder.IterateAllByInterface (TagSetterAdapter.GType)) {
-                ITagSetter tag_setter = element as ITagSetter;
-
-                if (tag_setter != null) {
-                    tag_setter.AddTagValue (TagMergeMode.ReplaceAll, Constants.TAG_ENCODER,
-                        new GLib.Value (String.Format ("Banshee {0}", Banshee.ServiceStack.Application.Version)));
-                    tag_setter.AddTagValue (TagMergeMode.ReplaceAll, Constants.TAG_VERSION,
-                        new GLib.Value ( (version.Major << 16) | (version.Minor << 8) | version.Build));
-
-                    if (tags != null) {
-                        tag_setter.MergeTags (tags, TagMergeMode.Append);
-                    }
-
-                    /*if (banshee_is_debugging ()) {
-                        bt_tag_list_dump (gst_tag_setter_get_tag_list (tag_setter));
-                    }*/
-
-                    // We'll warn the user in the UI if we can't tag the encoded audio files
-                    taggingSupported = true;
-                }
-            }
-
             // Begin the rip
             cddasrc ["track"] = trackIndex + 1;
             pipeline.SetState (State.Playing);
diff --git a/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs b/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs
index f1f1558..172cb4d 100644
--- a/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs
+++ b/src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs
@@ -207,13 +207,7 @@ namespace Banshee.OpticalDisc.AudioCd
             track.PrimarySource = ServiceManager.SourceManager.MusicLibrary;
             track.Uri = args.Uri;
 
-            track.FileSize = Banshee.IO.File.GetSize (track.Uri);
-            track.FileModifiedStamp = Banshee.IO.File.GetModifiedTime (track.Uri);
-            track.LastSyncedStamp = DateTime.Now;
-
-            using (var file = StreamTagger.ProcessUri (track.Uri)) {
-                StreamTagger.TrackInfoMerge (track, file, true);
-            }
+            StreamTagger.SaveToFile (track, true, false, false);
 
             track.Save ();
 
