Temp Fix USB Core

* Need to investigate USB merges still but let's revert temporarily.

Signed-off-by: Chet Kener <Cl3Kener@gmail.com>