revert autofixed patches of last commit for 5.2x compatibility (refs #2128)

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