Sigh, Handshake is used by the `internal` package. I think it's time to fork a _1.x_ branch and designate master for 2.x development.