Make client start up again:

- Hacked together a solution to provision the client configurations as
  well, not yet satisfied with the results.
Minor cleanup.