Index: drivers/storage/class/disk/disk.c
===================================================================
--- drivers/storage/class/disk/disk.c	(revision 70555)
+++ drivers/storage/class/disk/disk.c	(working copy)
@@ -4393,6 +4393,9 @@
     PDISK_DATA                diskData;
     ULONG                     partitionNumber;
 
+    DPRINT("UpdateRemovableGeometry FIXME\n");
+    return(STATUS_SUCCESS);
+
     //
     // Determine if the size of the partition may have changed because
     // the media has changed.
Index: drivers/usb/usbstor/disk.c
===================================================================
--- drivers/usb/usbstor/disk.c	(revision 70555)
+++ drivers/usb/usbstor/disk.c	(working copy)
@@ -645,10 +645,7 @@
         RtlZeroMemory(ScsiInquiryData, sizeof(INQUIRYDATA));
         ScsiInquiryData->DeviceType = UFIInquiryResponse->DeviceType;
         ScsiInquiryData->DeviceTypeQualifier = (UFIInquiryResponse->RMB & 0x7F);
-
-        /* Hack for IoReadPartitionTable call in disk.sys */
-        ScsiInquiryData->RemovableMedia = ((ScsiInquiryData->DeviceType != DIRECT_ACCESS_DEVICE) ? ((UFIInquiryResponse->RMB & 0x80) ? 1 : 0) : 0);
-
+        ScsiInquiryData->RemovableMedia = ((ScsiInquiryData->DeviceType == DIRECT_ACCESS_DEVICE) ? ((UFIInquiryResponse->RMB & 0x80) ? 1 : 0) : 0);
         ScsiInquiryData->Versions = 0x04;
         ScsiInquiryData->ResponseDataFormat = 0x02;
         ScsiInquiryData->AdditionalLength = 31;