CRM-19873 without api call