Revert "client api"

This reverts commit 254d84bd2d7db10ec86529fbf17b9fda6b4b99a5.