Fix sync again

Change-Id: Ibd7831a2fd498e5a406bf70e0bdf669027754cd3