Revert "test: attempting cleaner sync code"

This reverts commit 62384f4e9f8fa74c0ac7c8dd4d876ebdb5908d56.