Updates #2708 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com> (cherry picked from commit 21cb0b361f)
21cb0b361f