Revert "Refactor by turegjorup: Evil kernel hack removed, DI used instead"

This reverts commit e4cdd7a3560c6f448407a9ca04649b47781c6a1c.
Merge branch 'development' into feature-calendar