This reverts commit bd91695f.

Co-authored-by: volokluev <3169433+volokluev@users.noreply.github.com>