Forward port r62848.
1 file changed