Merge "Revert "Remove a misleading "flush" function.""