The import name type-checking was causing build problems. Will fix, but reverting for now