Backport fix of #1752175.
2 files changed