Backport of r52862.
1 file changed