commit 0a882cad upstream.

fdo#93634
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
[ kamal: backport to 3.13-stable: context ]
Signed-off-by: Kamal Mostafa <kamal@canonical.com>