Disabled the critical section in OnHotplug to try and avoid a deadlock (not sure it's required anyway).