> I think the easiest fix is to revert the oid part of commit 51cd5d6f0,
> leaving behind the int2 and oid8 parts. The asymmetry between the 2
> oid types would look odd, though, so that would require an explanatory
> comment.
Yes, that was my conclusion too, but I wanted to leave the decision up
to you and Baji Shaik.