Fix service uninstall (fixes MO-258)