Related: https://pagure.io/koji/issue/4313
rebased onto 5e1584ec88a159c75adc15a864ffc7e60262ce0d
rebased onto 4270cdd4c132428eb9bdccf500a29ce481a8fde3
Commit 77d56ccd fixes this pull-request
Pull-Request has been merged by tkopecek
Related: https://pagure.io/koji/issue/4313