1050 tickets (FAILED)
Revert "Fix fatal mistake"

This reverts commit 58f3b83a8f0520910cce83463716567526d520f0.
Revert "Refactor"

This reverts commit 9d666fe4a2faf8d77c45745e9fe8d79b499d47af.