* restore some of the changes from r11623 lost in r11649


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