Remove all duplication prevention code.
Merge branch '3715'.