EUCA-9996: revert the part of the merged pull request