CRM-14197 remove rebase introduced error
Merge pull request #3381 from eileenmcnaughton/CRM-14197

CRM-14197 remove rebase introduced error