This reverts commit 084877eb52. The mentioned commit caused some systems to have some services reported as crashed. This fixes #297. This fixes #298.
084877eb52