Backported fix for bug 243346.
3 files changed