Original commit message from CVS: * ext/tcp/*: Revert Zaheer changes, to make things actually work again.