Revert r3817 as partial or incorrect fix. See ticket #633 for details.

git-svn-id: http://svn.osgeo.org/geos/trunk@3818 5242fede-7e19-0410-aef8-94bd7d2200fb