Revert "Removing sorting, increase resend timeout"

This reverts commit b8afa37970b9174b649a7942db0b16730245eaba.