Cherry-pick upstream patch f460883035ef849a2248b1713f711292ec19f4f0 Fixes BZ#2132715 Reviewed-by: Carlos O'Donell <carlos@redhat.com>