Rolling back changes to Client