Some (speculative) protocol rework.  Still not right.