BUG: 343153 Signed-off-by: Andreas Schneider <asn@cryptomilk.org> (cherry picked from commit 860ceeaa)