7421 sync client

Is this TODO still a valid concern? Do we have a test to check that this doesn't result in the undesirable behaviour mentioned (i.e. remote data getting trounced by local updates, even if they may be incorrect)