Rework module importing completely.

[Deliver #59899758]