Backported fix for bug 244667.
4 files changed