revert USB crap for real this time