Revert "Fix other sync problem"

This reverts commit d13dc4d67267b53c102e9048658a2ba73aae29ee.