Revert "Renamed sync to flush"
Sorry, this was not supposed to go into next.

This reverts commit 0fb30cf44d489319f2a13ab6cb9e1c6778f1a246.