--- solid/solid/backends/udisks/udisksdevice.cpp.org	2011-12-22 20:28:47.539273958 +0100
+++ solid/solid/backends/udisks/udisksdevice.cpp	2011-12-22 20:29:17.170274459 +0100
@@ -560,32 +560,6 @@
         {
             if ( isOptical )    // optical stuff
             {
-                bool isWritable = prop( "OpticalDiscIsBlank" ).toBool() || prop("OpticalDiscIsAppendable").toBool();
-
-                const UDisks::OpticalDisc disc(const_cast<UDisksDevice*>(this));
-                Solid::OpticalDisc::ContentTypes availContent = disc.availableContent();
-
-                if (availContent & Solid::OpticalDisc::VideoDvd) // Video DVD
-                    return "media-optical-dvd-video";
-                else if ((availContent & Solid::OpticalDisc::VideoCd) || (availContent & Solid::OpticalDisc::SuperVideoCd)) // Video CD
-                    return "media-optical-video";
-                else if ((availContent & Solid::OpticalDisc::Data) && (availContent & Solid::OpticalDisc::Audio)) // Mixed CD
-                    return "media-optical-mixed-cd";
-                else if (availContent & Solid::OpticalDisc::Audio) // Audio CD
-                    return "media-optical-audio";
-                else if (availContent & Solid::OpticalDisc::Data) // Data CD
-                    return "media-optical-data";
-                else if ( isWritable )
-                    return "media-optical-recordable";
-                else
-                {
-                    if ( media.startsWith( "optical_dvd" ) || media.startsWith( "optical_hddvd" ) ) // DVD
-                        return "media-optical-dvd";
-                    else if ( media.startsWith( "optical_bd" ) ) // BluRay
-                        return "media-optical-blu-ray";
-                }
-
-                // fallback for every other optical disc
                 return "media-optical";
             }