Add unique restrictions
Add unique restrictions
Revert "Add unique restrictions"

This reverts commit 70dd358916d1cf329f0425025019c29b220d8600.