Backported bug 149633.
3 files changed