The original coding in 7bafffea and previous wasn't all that great
anyway.

Reported by Jeff Janes and Tom Lane