CRM-13625 - Revert commit due to failing tests