Re-enable conditionals around local sync