[pungi-fedora] PR #1250: Revert kiwi changes until we fix a few things