This reverts commit 117b8a10, which
was commit 29c4afc4 upstream.  The bug
it fixes upstream clearly doesn't exist in 3.2.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>