Reverting changes of CRM-14850