Actually reorganize sync manager again