Bug 847299 - After landing Bug 805240 FB automatic synchronization has s...

...topped working 

PR for the v1.0.1 branch