Revert "custom hotplug"

This reverts commit 51249c0261008ef5d473a0acf46d4bb61982c903.