Backport r82456.
2 files changed