Revert "franco hotplug and fixes"

This reverts commit 54154f0f5a2b033d723eb41ad85cc60e7ede8057.