Thanks cacahuatl!

Partially revert the previous commit.

Let's hope this avoids creating too many duplicates.

Thanks Loïc Dachary for the report that lead to this improvement.

No commit message