Move Profile wrapper back.

Will instead use a new wrapper when I switch to the new core model.