Revert "reSync"

This reverts commit f4915b56d28fdc231771c571fc3953b8bcdd176b.
reSync (reverted from commit f4915b56d28fdc231771c571fc3953b8bcdd176b)