Backport the MR I sent to fix this bug, so Rawhide is fixed on next compose - if a different fix is chosen upstream we can just back this out / replace it with that one.
