Fix initial handshake with central servers; takes potentially two steps now.