Let another whack at restoring import speed

[ci skip]
Merge pull request #73 from le717/restore-speed-take-2

Restore import speed - Take 2