diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
index f03d29c..05e4951 100644
--- a/gst/playback/gstdecodebin2.c
+++ b/gst/playback/gstdecodebin2.c
@@ -1815,12 +1815,13 @@ gst_decode_group_new (GstDecodeBin * dbin, gboolean use_queue)
 
   if (mq) {
     /* we first configure the multiqueue to buffer an unlimited number of
-     * buffers up to 5 seconds or, when no timestamps are present, up to 2 MB of
-     * memory. When this queue overruns, we assume the group is complete and can
-     * be exposed. */
+     * buffers and time, up to 2 MB of memory. When this queue overruns, we
+     * assume the group is complete and can be exposed. We are only concerned
+     * about not consuming excessive amounts of memory while we scan the file
+     * for data streams. */
     g_object_set (G_OBJECT (mq),
         "max-size-bytes", 2 * 1024 * 1024,
-        "max-size-time", 5 * GST_SECOND, "max-size-buffers", 0, NULL);
+        "max-size-time", 0, "max-size-buffers", 0, NULL);
     /* will expose the group */
     group->overrunsig = g_signal_connect (G_OBJECT (mq), "overrun",
         G_CALLBACK (multi_queue_overrun_cb), group);
