Fix is included in rev#74504.