.......... [ZBXNEXT-826] undoing changes in r43978