We already cherry-picked this when we vendored 1822467bec1c91b8d782e9c7f24342d1d65f01f2.