related: rhbz#1950629 (cherry picked from commit 12ac128d73)
12ac128d73
resolves: rhbz#1950629 Except this is not a merge, for stupid tooling reasons.