Revert "Remove the restriction on thrift_client, just for giggles"

This reverts commit fd232a360d98ef3fe2eab8e124bbd6a91cfe0d85.