Reverted Client.php in preparation to making a branch