revert a part of r11036, causes problems with 7490labor  (refs #2185)

git-svn-id: file:///var/svn/freetz/trunk@11037 149334a1-2f27-0410-a3b9-fc62619ac1e6