- Drop the custom service file, use the packaged one
- Merge in the comments from the packaged config file