SD-1288 : Revert back the changes performed by commit