Move setting of the handshake header up one more level