Revert "Merge pull request #1544 from eileenmcnaughton/master"

This reverts commit 008240e2a4a0a3957d58c891604656a679fbf0c6, reversing
changes made to f1951871b75764859fd45e23aff8933bf955de36.
Merge pull request #1547 from kurund/CRM-9493

Revert "Merge pull request #1544 from eileenmcnaughton/master"