I'm not much happy about the evolution of this, but it seems like we cannot do any better. The change looks good to me. -- To view this pull request on github, visit https://github.com/rhinstaller/lorax/pull/9