--- a/components/openssh/sources/ssh.xml	Tue Mar 22 18:37:14 2016 -0700
+++ b/components/openssh/sources/ssh.xml	Wed Mar 23 08:57:50 2016 -0700
@@ -49,13 +49,6 @@
 		<service_fmri value='svc:/system/utmp' />
 	</dependency>
 
-	<dependency name='network_ipfilter'
-		grouping='optional_all'
-		restart_on='error'
-		type='service'>
-		<service_fmri value='svc:/network/ipfilter:default' />
-	</dependency>
-
 	<dependency name='config_data'
 		grouping='require_all'
 		restart_on='restart'
@@ -120,20 +113,6 @@
                         value='solaris.smf.manage.ssh' />
         </property_group>
 
-	<property_group name='firewall_context' type='com.sun,fw_definition'>
-		<propval name='name' type='astring' value='ssh' />
-		<propval name='ipf_method' type='astring'
-		    value='/lib/svc/method/sshd ipfilter' />
-	</property_group>
-
-	<property_group name='firewall_config' type='com.sun,fw_configuration'>
-		<propval name='policy' type='astring' value='use_global' />
-		<propval name='apply_to' type='astring' value='' />
-		<propval name='exceptions' type='astring' value='' />
-		<propval name='value_authorization' type='astring'
-			value='solaris.smf.value.firewall.config' />
-	</property_group>
-
         <property_group name='sysconfig' type='sysconfig'>
                 <stability value='Unstable' />
                 <propval name='group' type='astring' value='network' />