[PATCH 1/2] Disable the service only on successful exit (#967617)