Revert "Try some fixes for sync"

This reverts commit 525511fc0b3db05a63f6347a107a2c07b60fc593.