I wrote: > I'd been hesitant to back-patch dddfc4cb2 back in April; but now that > it's survived some beta testing, I think that doing so seems like the > most appropriate way to fix this.
Done. Hopefully I didn't break anything; a lot of this code has mutated
to some extent since 9.3. But I expect the buildfarm will point out any
problems.
regards, tom lane
