Hotfix strict injection to undo terrible breakage