Revert "Remove broken stuff for now; need to undo all the cool dynamic service name code to get parameters to work right"

This reverts commit 30a4c69a7455589c5fc462719625ae13aa5670c6.