Flock more aggressively #3375