We already cherry-picked this when we vendored d75b9e9ff0.