Revert "New heuristique, and it's working !"

This reverts commit 01bf250ff05145183d40ef1e350d717364ad0a57.