Revert "Better duplicate detection"

This reverts commit a5e93e0f1a51e764ed2b8278e8d579d78f434303.