Broke plugins with a not-quite-done refactor...