I went ahead and pushed this, since the window for getting buildfarm testing done before Monday's wrap is closing fast. We can always improve on it later, but I think beta3 ought to carry some fix for the problem.
regards, tom lane
