diff --git a/docs/changelog.rst b/docs/changelog.rst
index d51b4bf1..f7b7beb4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,16 @@ Changelog
 
 This changelog is used to track all major changes to Mopidy.
 
+v1.0.4 (unreleased)
+===================
+
+Bug fix release.
+
+- Audio: Since all previous attempts at tweaking the queuing for :issue:`1097`
+  seems to break things in subtle ways for different users. We are giving up
+  on tweaking the defaults and just going to live with a bit more lag on
+  software volume changes. (Fixes: :issue:`1147`)
+
 
 v1.0.3 (2015-04-28)
 ===================
@@ -16,7 +26,7 @@ Bug fix release.
 
 - Audio: Follow-up fix for :issue:`1097` still exhibits issues for certain
   setups. We are giving this get an other go by setting the buffer size to
-  maximum 100ms instead of a fixed number of buffers. (Fixes: :issue:`1147`,
+  maximum 100ms instead of a fixed number of buffers. (Addresses: :issue:`1147`,
   PR: :issue:`1154`)
 
 
@@ -30,7 +40,7 @@ Bug fix release.
 
 - Audio: Fix for :issue:`1097` tuned down the buffer size in the queue. Turns
   out this can cause distortions in certain cases. Give this an other go with
-  a more generous buffer size. (Fixes: :issue:`1147`, PR: :issue:`1152`)
+  a more generous buffer size. (Addresses: :issue:`1147`, PR: :issue:`1152`)
 
 - Audio: Make sure mute events get emitted by software mixer.
   (Fixes: :issue:`1146`, PR: :issue:`1152`)
diff --git a/mopidy/audio/actor.py b/mopidy/audio/actor.py
index 7cca954a..fcd1e233 100644
--- a/mopidy/audio/actor.py
+++ b/mopidy/audio/actor.py
@@ -161,11 +161,7 @@ class _Outputs(gst.Bin):
         logger.info('Audio output set to "%s"', description)
 
     def _add(self, element):
-        # All tee branches need a queue in front of them.
-        # But keep the queue short so the volume change isn't to slow:
         queue = gst.element_factory_make('queue')
-        queue.set_property('max-size-time', 100 * gst.MSECOND)
-
         self.add(element)
         self.add(queue)
         queue.link(element)