Revert "Optimize service restart logic."

This reverts commit 16522412eb47127f90070cb190af8e5a6702a7b0.

Reason for revert: solution needs some adjustments - will update with a better solution.

Change-Id: I74ed92225017a8c1ac23176ed176663acfef7578
4 files changed