211d662708
This reverts commit ec8da2033c.
For the reason for the revert see KT-53719
^KT-8263 Open
^KT-53719 Fixed