Simplify iconv patch. Signed-off-by: Rosen Penev <rosenp@gmail.com> (cherry picked from commit 63ba2ccbda)
63ba2ccbda