Revert "fix for GEOT-3101:"

This reverts commit 44ac2997dd125bd1bda6e7ade9326af61ddf15d9.

Sorry, obviously github needs a new branch for each pull-request