Make auto-syncing optional