Revert "Temp Fix USB Core"

This reverts commit 4edd2db33b3ffc60ce1f241b70874936f20d41a2.
Fix

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