--- a/components/net-snmp-57/svc-net-snmp	Wed Apr 27 22:46:14 2016 -0700
+++ b/components/net-snmp-57/svc-net-snmp	Wed Apr 27 22:46:14 2016 -0700
@@ -20,7 +20,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # ident	"@(#)svc-net-snmp	1.2	10/10/24 SMI"
 #
@@ -29,25 +29,11 @@
 
 . /lib/svc/share/smf_include.sh
 
-SMF_FMRI=svc:/application/management/net-snmp
 SNMPD_FILE=/etc/net-snmp/snmp/snmpd.conf
 SNMPCONFPATH=/etc/net-snmp/snmp:/var/net-snmp
 MIBDIRS=/etc/net-snmp/snmp/mibs
-CPU_ARCH=`/usr/bin/arch`
 
 export SNMPCONFPATH
 export MIBDIRS
 
-
-if [ "$CPU_ARCH" == "i86pc" ]; then
-    arch_type=`/bin/svcprop -p general/arch_type $SMF_FMRI`
-    if [ "$arch_type" == "32" ]; then
-        /usr/sbin/i86/snmpd
-    elif [ "$arch_type" == "64" ]; then
-        /usr/sbin/amd64/snmpd
-    elif [ "$arch_type" == "0" ]; then
-        /usr/sbin/snmpd
-    fi
-elif [ "$CPU_ARCH" == "sun4" ]; then
-	/usr/sbin/snmpd
-fi
+/usr/sbin/snmpd