Going to update the PR here, `client` is not available anymore.