CRM-7964 one less eval