HomeFreeBSD

MFC: r302916

Description

MFC: r302916

Revert 302324 and properly fix the crash with ISO-8859-5 locales

PR: 211135
Reported by: jkim
Tested by: jkim
Approved by: re (gjb)