quickfix: resolve imports broken by last commit