Get rid of dependency on Commons Codec