Fix import from non-used library, i.e. going back to guava