Back out initial minor changes to remove <orcid> from <orcid-profile>.

Need these changes, if we are going to keep orcid-profile/orcid in v1.0.16.