..F....... [ZBXNEXT-2124] revert bad merge