Comment 2 for bug 1854151

Attaching a patch ported from ECL's FORMAT.