Bring back service restart on first run

Ref #5