094efad728
This mostly just reimplements the best parts of the discarded branch: > discard-encapsulated-packets There may still be some work needed.