Split the client restore stuff better.