Revert "oneSync"

This reverts commit 658d63eb777c7266b7d90707778ce7f1dfed9ab9.