Revert "Merge pull request #2543 from kurund/CRM-14241"

This reverts commit 05288fce26229abf39dec0166075e388d56b1848, reversing
changes made to 516ee52acea65cc19face3cf3e3e880457ce125a.
Merge pull request #2555 from kurund/undobadcommit

Revert "Merge pull request #2543 from kurund/CRM-14241"