Fix for nova/cloud-init bug?