.......... [ZBXNEXT-207] undoing incorrectly merged changes

git-svn-id: svn://svn.zabbix.com/trunk@50125 f4e7fd02-d210-4e34-a1e0-d4093fb66cc2