undo 3089 and fix 3076

git-svn-id: http://farmanager.com/svn/trunk@9351 72235d2c-c60c-0410-a47a-a0032694dc5d
fix 3076

git-svn-id: http://farmanager.com/svn/trunk@9353 72235d2c-c60c-0410-a47a-a0032694dc5d