surrogates in narrow builds. Fixes issue #1706460. (Port of r63899).
Attach a file by drag & drop or click to upload
