* revert more incorrect parts of r10839
 * refs #2145


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