Revert "- Using unmodified client"

This reverts commit efed874eccdb735e7ce84cf99cf8ddb9599103d9.