Backported fix for bug 184860.
2 files changed