Backport part of r65043.
1 file changed