revert some of the import changes