SD-1288 : Revert back the changes performed by commit
Merge pull request #660 from ioanpocol/master

SD-1288 : Revert back the changes performed by commit