Revert "Experimenting with import order"

See #474 and commit message.