Use the SNMP fix from master.