Revert "deal with duplicity"

This reverts commit 580f4d21713a6a6971e539e9a16d332602662bad.