Optionally (#if 0 in code.) have new handshake. We can't fallback to old handshake though