Reapply backport of SNMP support