Handshake is not used anymore, so that's why this change.