Backported fix for bug 239442.
2 files changed