Restore explicit import support.
Merge pull request #114 from square/jw/explicit-imports

Restore explicit import support.