.......... [ZBX-8816] Reverted changes