Fix import errors, again.
(A rebase swallowed a commit somewhere)