This reverts commit 2d5ca118. The service shouldn't be running, only during startup and shutdown. Reverted changes and removed test.
