Revert "Changed to new service implementation"

This reverts commit 39da3f4fd4f0ffb45985af3a7407dfc070c39a86.