Bug 839675 - Prevent out-of-sync problems, r=mdas