Revert "LegacyUSB: Squashed commit with updates for 4.2"

This reverts commit e840eab793ac1451da686863834cb0f71aae3d11.