* revert incorrect parts of r11711


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