backport r73273
1 file changed