This commit effectively reverts changes made in the scope of KT-60193, namely c9eebffb and 2d50bd68. ^KT-60749 fixed
c9eebffb
2d50bd68