.......PS. [ZBX-8600] undoing changes in r48008