Fix import recursion issue.

Possibly breaks inheritance. Fingers crossed I'll start writing unit tests one day.