Revert a few unwanted import-related changes