Restore context to CRM.api CRM-12029