Update for str_to_utf8() changes.