As akio points out, the fix to #229 which I authored previously was blatantly
wrong.