Revert recent import changes

These don't do well with circular imports, so revert them for now.
I'll have to land a revised patch soon.