r25407: Revert Longhorn join patch as it is not correct for the 3.2 tree.