re-do change that got lost in upstream merge
Merge branch 'get-client-from-service' into run-multiple-command