Fix windows service.restart

Instead of doing weird sleep/recheck stuff, just use the existing
stop/start functions.