Revert "usb detection / power down changes"

This reverts commit 8edc4b9ce846ae6fddac69e474757796fb964ed2.