Revert to having the receiver handle timeouts on the receiving side.