Backported fix for bug 106221.
1 file changed