Attempt #2 at fixing USB, for real this time