Adding back the IntegerEncoding ...