Revert "Use the service name from the params"

This reverts commit c4dc725c2abd4ea733f5334329afa5860a563f02.