Fixes https://pagure.io/pagure/issue/3967
Looks good, but needs rebase.
rebased onto a7717f0a1fbbfcd147c2e7bbc2d14bb549521daf
Pull-Request has been merged by pingou
Fixes https://pagure.io/pagure/issue/3967