This reverts commit 07fe0bf3. This was not working properly on system without geos library installed.