Revert "Временный костыль :)"

This reverts commit 14cb9939033f5757291bf272944624434182dfe7.