Better workaround for rpm branches