Revert back to qualified imports