back to ASMP and remove MSM-Hotplug for now