Sync with upstream's fix for PR#3321.

(Imported from upstream's f710c3f198c9980a1056bac9b4b9617554254671)
1 file changed