revert changes to allow multiple identifiers with same identifier types TRUNK-4293