Revert "hub_client updates"

This reverts commit b2f23c1d8081e556744f38051fab704318eaace8.