Revert "Fix some imports"

This reverts commit 8dde844c104911abbf9284b01f4319bf73b21755.