move usb etc. back to it's original place (Jim Morris: "race condition")

--HG--
extra : source : 697344be38b0223dbb598f88aeb75f9828aff2f1
build