Handle protocol desyncs after failed put + data

See full commit message.