Removed self-send optimization for better logging
Added timestamp back to ACKs