There is a related bug at redhat, where Hans de Goede seem to having submitted a working patch upstream: https://bugzilla.redhat.com/show_bug.cgi?id=1842039