Merge change 23370 into eclair

* changes:
  Revert "- don't schedule syncs that we will never dispatch"