More tinkering
Revert "Handshake almost complete"

This reverts commit 3d1a1d703c9f04415276bb9bf95cbf553b385840.