Revert "последствия кривого мерджа"

This reverts commit 5c5c89981bfff4f67d92e2dd3d8fcfb19560289a.