Fix the service lifecycle. Killing the service is now only done with user explicit demand.