@vojtechtrefny given all of that I think your original patch is the best short-term fix
(assuming it doesn't break anything), #297 being a worthy longer-term approach.
--
To view this pull request on github, visit
https://github.com/rhinstaller/blivet/pull/289