Revert "Not sure how this $SERVICE_NAME worked before at all"

This reverts commit 53cdb0e6cf743ae5f744c01e9a29b13a609f59e7.
Merge branch 'master' into worldmanager