Make usb_storage work on all targets again