CRM-12108 fix bug introduced when rebasing PR
Merge pull request #1307 from eileenmcnaughton/CRM-12108

 CRM-12108 fix bug introduced when rebasing PR