CRM-13209 patch applied.