Fixes: https://pagure.io/koji/issue/3035
See my comments in #3035
rebased onto 2b442d178d09a48f5362a873344b2f01915c6076
Metadata Update from @tkopecek: - Pull-request tagged with: testing-ready
rebased onto 5251247733a7c7f6dc11ef19ad8d67b0ca0b7a01
rebased onto d0e0cfee788355f740487154ff9a617fe54494ea
Metadata Update from @ksulayma: - Pull-request tagged with: testing-done
Commit dc47bcc8 fixes this pull-request
Pull-Request has been merged by tkopecek
Fixes: https://pagure.io/koji/issue/3035