Revert to changes for sync manager