Backport relevant part of r66274 (in issue #874900).
1 file changed