merge messed up our cloud-config a bit