diff --git a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/DiskDevice.cs b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/DiskDevice.cs
index 7eab0a6..b91d6cb 100644
--- a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/DiskDevice.cs
+++ b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/DiskDevice.cs
@@ -40,12 +40,15 @@ namespace Banshee.Hardware.Gio
 
         public static new IDiskDevice Resolve (IDevice device)
         {
-            var raw = device as IRawDevice;
-            if (raw != null) {
-                if (raw.Device.UdevMetadata.GetPropertyString ("ID_TYPE") == "disk") {
-                    return new DiskDevice (raw.Device);
-                }
-            }
+            // This test incorrectly marks some devices as a DiskDevice instead
+            // of a volume. See https://bugzilla.gnome.org/show_bug.cgi?id=629179
+            // By commenting this out the device is correctly recognised as a volume.
+//            var raw = device as IRawDevice;
+//            if (raw != null) {
+//                if (raw.Device.UdevMetadata.GetPropertyString ("ID_TYPE") == "disk") {
+//                    return new DiskDevice (raw.Device);
+//                }
+//            }
             return null;
         }
 

