Revert "Исправляем конфликты"

This reverts commit 1f4f738b15cc9fd297ac6cdfcdfe2ca80e54acc9, reversing
changes made to 983593d2dbed1fa516e3c14107f7873e3617f2b4.