CRA-528
Removed change from last commit