Revert "fix: comment out return statement in handshake process"