Reverted upstream USB changes