Revert "Fix a few imports"

This reverts commit d8495ed6d741701c32de95931d65c5f1004d2985.