Revert "Revert "Fix statistics race condition on big flows""