Revert "Baysync manual merge"

This reverts commit 7363db9a40fc05a02bf9299066d0735615f12ed0.