Revert importing fixes

This reverts commit 2fd826362e6ec7274011b46a5d01a0cb3764d54f.
This reverts commit 4e52c066d652273146fee734b20b096d89e2baa4.
This reverts commit 27a97a0fd247b792b4818ea127acc41c13296d6d.