Apply eileen's patch for CRM-14196