Support being able to do separate step of do_handshake