(Follow-up r86169) Needed supress warnings around iconv