Up to cirros-0.3.1