Applied manual patch from diff between xprofile-backbone and xprofile-types

Idea is to grab the admin-only/backbone changes separate from the class
changes, and revisit the under-the-hood implementation in a
seperate/future update.