Revert "do not penaltize for same location"

This reverts commit 3331eabde683e753ed4178f5fa09881118af03a7.