This only needs a backport to 2.6 based on comment 1 of https://bugzilla.redhat.com/show_bug.cgi?id=1754489