reverted changes of CRM-14850