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