51adaec35a
This reverts commit 1b303ee5ba (#14609).
It caused a deadlock; see tailscale/corp#25965
Updates tailscale/corp#25965
Updates #13680
Updates #14606