CRM-12370 - Fix another regression from new hook code