Issue #1812338 by helmo: Refactor sync back.