Backported fix for bug 104022.
3 files changed