Backported fix for bug 206487.
2 files changed