Revert "CRM-12689-fixes : minor fix"

This reverts commit 0865b185bc5bd73fb5e89b938e5a4176c842a2a2.