revert import order (TODO : test this more)