Backport of r52227.
1 file changed