Revert "Merge pull request #2256 from 9rnsr/fix_imports"

This reverts most of commit 6cf399220142a05aba69be2f1ed489496a625aff