rollback change in svc_client since it seems to be problematic in some cases