Fix for #4182, needs testing

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@32520 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Revert: Fix for #4182, needs testing

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@32521 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e