Reverted my changes, they broke the unique index that was used to identify collisions, my bad for not having the tests run all the time.