Duping this to the existing bug since that will both fix this to use the new api and reset without a reboot
Duping this to the existing bug since that will both fix this to use the new api and reset without a reboot