Revert "Fix dupe bugs."

This reverts commit de1327466bdaea5e45d3c0210c1e97ec162f8d55.