Revert "Merge pull request #1645 from eileenmcnaughton/CRM-13379"

This reverts commit dcb91473ed06b6f221d2b726e6a41f2d844b7c16, reversing
changes made to bb40618ddaed08fc84508dc2178a9f37a016487a.
Merge pull request #1738 from kurund/CRM-13397

Revert "Merge pull request #1645 from eileenmcnaughton/CRM-13379"