Bug 923252 - Move synchronization into a separate script