Revert "A bit cleaned up imports"

This reverts commit 332742c8be30877a77d945716d2110bad2b37b7b.