Revert "Revert "Revert "try to update fb .. to use sync properly .."""

This reverts commit 566f69341da2d013bc89036c8fcc3b6c71151568.
one more try ..