reverse import chain

I think we should have done it this direction to begin with?