CMS7-7909: revert previous commit