Revert the qualified imports refactoring for merge compatibility