Fix client boostrap.

/ping @caridy