[sync] Improve performance after commit 6c5e2ea0