With this change we move one step closer to matching the wire protocol currently defined within the spec.