Revert "RequiresUnique" patch. This should be handled at a lower level.