x64-upstream: rebase and remove filters in net