Restore import speed - Take 2

Hopefully this will solve #61 for real.