undo last merge
Merge pull request #692 from kurund/CRM-12458

undo last merge: 5a10656d1e6f02ef543375e974b2439c50f3f66d