* revert unintended changes from r12424
 * refs #2536, refs #2544


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