revert a part of the revert r10424

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