Backported bug 203040.
2 files changed