Revert "cope with duplicate external_ids (bug 836797)"

This reverts commit d7bfb4d50168c481ce17206760ea7347582f5ab1.