CRM-13763

Full fix.