The author (@pprindeville) of the original commit noted that the wrong
commit was picked, see
325b7d2cd2 (commitcomment-22387528)
"Err... looks like the wrong fix got committed. I was hoping that this
commit d902e5d would have gone in instead."
This reverts commit 325b7d2cd2d6e9d4903c6e7628c7c9ae0ddab564.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>