Remove the reordering side-effect of the latter sync changes