Move from commons-codec to guava