Merged upstream's fix 2605b55.