Fix for PR c/59825.