Ticket #3485: redoing some part of r30934

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