This reverts commit 37d11d00e56ec6ff402a13a28ec308c13291a937.
Reason for revert: reverting this revert as the issue caused by the original patch (before the first revert) is fixed by:
https://review.opendev.org/c/openstack/devstack/+/881504
Therefore we can proceed with the cirros version bump.
Change-Id: I43e2b04a0142c19fb1a79da5a33cc444149e18f1