Revert "Allow method chaining on Client"

This reverts commit 50ac5d1efbf27c3489d2bdcf8dc867be635f8aab.