Revert "more little service setup things"

This reverts commit 98f477e54cd5d2b0f9cf7707c92071437fcb9189.