Revert "Merge pull request #4 from mostafaeweda/master"

This reverts commit 33705c6ee8b632199731744a55413252cbe83c25, reversing
changes made to 83c5077f985c9759df8c2be0808ce7fe852944a3.
Merge pull request #6 from gjtorikian/fix-sync-logic

Revert "Merge pull request #4 from mostafaeweda/master"