This reverts commit d73f960aab. Problems with deadlocking arises due to orphaned packets in per-peer queues. Additional work on this issue continues in seperate branch.
d73f960aab