Fixes #1344 honor unique false

Here it is as a squashed single commit.