Revert "Revert 639 imports"
Merge pull request #646 from github/revert-642-revert-639-imports

Revert "Revert 639 imports"