Fixed imports

Inlined so the patch doesn't contain imports.