Import: Defer dependency resolution

Fixes #598