The patches committed as 6e71dd7c
and 3a1f8611 were developed in
parallel but dependent on each other in a way that I failed to
notice.

This patch to fix the problem was prepared by Amit Kapila.