Revert "Fixed issue MMCMS-187"

This reverts commit f295acdeae506921e2466ee66ebf2a13f73b5f8d.