Getting rid of this patch since the patch that uses iconv is a