This reverts commit b48f287493. Reason for revert: https://review.opendev.org/c/openstack/diskimage-builder/+/846078 Change-Id: I9d51111af6fb5307fdd6fbcdeab1ebcccfed6111
b48f287493