Revert "Merge pull request #689 from Doude/bug/1313544"

This reverts commit 26f390aaac6cee807da4c6dcb245c0d51eff9670, reversing
changes made to 448772eb9f9e3eb2b0c98cd95638a734fa880520.

Conflicts:
	src/config/svc-monitor/svc_monitor.py

Closes-bug: #1313544
Change-Id: Id6a1c414184407203b058b612c0846e422c65d9c
Merge "Revert "Merge pull request #689 from Doude/bug/1313544""