Created by: kopancek
This reverts commit 41c631e5b92e26c33bac388bbb913fcf9254fedc.
Unit tests, tested manually, tested in CI