Please please please please, dependency injection, no further hacks. See #5515