Bug 1034347 - Bringing back the edge-candidate logic to prevent crazy overfill rate