Revert "Updates to router and client"
Merge pull request #123 from kbase/revert-122-master

Revert "Updates to router and client"