CRM-14449 give up on fixing last 2 entities