Go back to service for now because addon doesn't work
Go back to service for now because addon doesn't work


Former-commit-id: 9af0c77b6fe7b2224521cbec99d8f5717cb0cad5
brandur/sorg,brandur/sorg,brandur/sorg,brandur/sorg,brandur/sorg