Workaround zeitgeist circular dependencies