Fix unwanted extra syncs from previous commit

Change-Id: Ice669f13462676ee978937ee0d533ff28266fe40