.......PS. [ZBXNEXT-207] undoing chenges in r50125
.......PS. [ZBXNEXT-207] undoing chenges in r50122