Backported fix for bug 200456.
1 file changed