Clean up recent cherry-pick bringing hotpug