This dependency injection madness must end!