Perhaps we can get back our previous behavior for uniqueness constraints here.