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

...topped working (branch v1-train)