plugin usb-storage: revert 3e8d661