diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
index 317d11ac7..bc3d1b2ae 100644
--- a/src/NetworkManagerUtils.c
+++ b/src/NetworkManagerUtils.c
@@ -307,7 +307,7 @@ nm_utils_get_shared_wifi_permission (NMConnection *connection)
 	s_wifi = nm_connection_get_setting_wireless (connection);
 	if (s_wifi) {
 		s_wsec = nm_connection_get_setting_wireless_security (connection);
-		if (nm_setting_wireless_get_security (s_wifi) || s_wsec)
+		if (s_wsec)
 			return NM_AUTH_PERMISSION_WIFI_SHARE_PROTECTED;
 		else
 			return NM_AUTH_PERMISSION_WIFI_SHARE_OPEN;
diff --git a/src/devices/nm-device-wifi.c b/src/devices/nm-device-wifi.c
index ef37067c4..3dda4c46c 100644
--- a/src/devices/nm-device-wifi.c
+++ b/src/devices/nm-device-wifi.c
@@ -3001,7 +3001,7 @@ act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason)
 	}
 
 	/* have secrets, or no secrets required */
-	if (nm_setting_wireless_get_security (s_wireless)) {
+	if (nm_connection_get_setting_wireless_security (connection)) {
 		nm_log_info (LOGD_DEVICE | LOGD_WIFI,
 		             "Activation (%s/wireless): connection '%s' has security"
 		             ", and secrets exist.  No new secrets needed.",
diff --git a/src/nm-wifi-ap-utils.c b/src/nm-wifi-ap-utils.c
index 29aa52a4d..260e19a69 100644
--- a/src/nm-wifi-ap-utils.c
+++ b/src/nm-wifi-ap-utils.c
@@ -547,7 +547,7 @@ nm_ap_utils_complete_connection (const GByteArray *ap_ssid,
 	    && (ap_wpa_flags == NM_802_11_AP_SEC_NONE)
 	    && (ap_rsn_flags == NM_802_11_AP_SEC_NONE)) {
 		/* Make sure the connection doesn't specify security */
-		if (nm_setting_wireless_get_security (s_wifi) || s_wsec || s_8021x) {
+		if (s_wsec || s_8021x) {
 			g_set_error_literal (error,
 			                     NM_SETTING_WIRELESS_SECURITY_ERROR,
 			                     NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
@@ -558,9 +558,6 @@ nm_ap_utils_complete_connection (const GByteArray *ap_ssid,
 	}
 
 	/* Everything else requires security */
-	g_object_set (G_OBJECT (s_wifi),
-	              NM_SETTING_WIRELESS_SEC, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
-	              NULL);
 	if (!s_wsec) {
 		s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
 		nm_connection_add_setting (connection, NM_SETTING (s_wsec));
diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c
index 211e19909..50361ed05 100644
--- a/src/settings/plugins/ifcfg-rh/reader.c
+++ b/src/settings/plugins/ifcfg-rh/reader.c
@@ -3285,9 +3285,6 @@ wireless_connection_from_ifcfg (const char *file,
 			nm_connection_add_setting (connection, security_setting);
 			if (s_8021x)
 				nm_connection_add_setting (connection, NM_SETTING (s_8021x));
-
-			g_object_set (wireless_setting, NM_SETTING_WIRELESS_SEC,
-			              NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NULL);
 		}
 	}
 
diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c
index 282253679..11e1d7b90 100644
--- a/src/settings/plugins/ifcfg-rh/writer.c
+++ b/src/settings/plugins/ifcfg-rh/writer.c
@@ -911,7 +911,7 @@ write_wireless_setting (NMConnection *connection,
 	svSetValue (ifcfg, "DEFAULTKEY", NULL, FALSE);
 	svSetValue (ifcfg, "SECURITYMODE", NULL, FALSE);
 
-	if (nm_setting_wireless_get_security (s_wireless)) {
+	if (nm_connection_get_setting_wireless_security (connection)) {
 		if (!write_wireless_security_setting (connection, ifcfg, adhoc, no_8021x, error))
 			return FALSE;
 	} else {
diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c
index cec573cfe..9f389ae65 100644
--- a/src/settings/plugins/ifnet/connection_parser.c
+++ b/src/settings/plugins/ifnet/connection_parser.c
@@ -1721,15 +1721,9 @@ ifnet_update_connection_from_config_block (const char *conn_name,
 		/* wireless security setting */
 		wsec = make_wireless_security_setting (conn_name, basepath, &s_8021x, error);
 		if (wsec) {
-			nm_connection_add_setting (connection,
-						   NM_SETTING (wsec));
+			nm_connection_add_setting (connection, NM_SETTING (wsec));
 			if (s_8021x)
-				nm_connection_add_setting (connection,
-							   NM_SETTING
-							   (s_8021x));
-			g_object_set (wireless_setting, NM_SETTING_WIRELESS_SEC,
-				      NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
-				      NULL);
+				nm_connection_add_setting (connection, NM_SETTING (s_8021x));
 		}
 
 		if (error && *error) {
@@ -2379,7 +2373,7 @@ write_wireless_setting (NMConnection *connection,
 		g_free (tmp);
 	}
 
-	if (nm_setting_wireless_get_security (s_wireless)) {
+	if (nm_connection_get_setting_wireless_security (connection)) {
 		if (!write_wireless_security_setting
 		    (connection, ssid_str, adhoc, no_8021x, error))
 			return FALSE;
diff --git a/src/settings/plugins/ifupdown/parser.c b/src/settings/plugins/ifupdown/parser.c
index de859c5b1..5ab2d854f 100644
--- a/src/settings/plugins/ifupdown/parser.c
+++ b/src/settings/plugins/ifupdown/parser.c
@@ -407,11 +407,8 @@ update_wireless_security_setting_from_if_block(NMConnection *connection,
 	}
 
 
-	if(security) {
-		nm_connection_add_setting(connection, NM_SETTING(wireless_security_setting));
-		g_object_set(s_wireless, NM_SETTING_WIRELESS_SEC, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NULL);
-	}
-
+	if (security)
+		nm_connection_add_setting (connection, NM_SETTING (wireless_security_setting));
 }
 
 static void
diff --git a/src/settings/plugins/keyfile/reader.c b/src/settings/plugins/keyfile/reader.c
index d03c9e038..9dae93a7e 100644
--- a/src/settings/plugins/keyfile/reader.c
+++ b/src/settings/plugins/keyfile/reader.c
@@ -894,10 +894,6 @@ static KeyParser key_parsers[] = {
 	  NM_SETTING_WIRELESS_BSSID,
 	  TRUE,
 	  mac_address_parser },
-	{ NM_SETTING_WIRELESS_SETTING_NAME,
-	  NM_SETTING_WIRELESS_SEC,
-	  TRUE,
-	  setting_alias_parser },
 	{ NM_SETTING_BLUETOOTH_SETTING_NAME,
 	  NM_SETTING_BLUETOOTH_BDADDR,
 	  TRUE,
diff --git a/src/settings/plugins/keyfile/writer.c b/src/settings/plugins/keyfile/writer.c
index af9c318ad..c94ca46fe 100644
--- a/src/settings/plugins/keyfile/writer.c
+++ b/src/settings/plugins/keyfile/writer.c
@@ -813,9 +813,6 @@ static KeyWriter key_writers[] = {
 	{ NM_SETTING_WIRED_SETTING_NAME,
 	  NM_SETTING_WIRED_CLONED_MAC_ADDRESS,
 	  mac_address_writer },
-	{ NM_SETTING_WIRELESS_SETTING_NAME,
-	  NM_SETTING_WIRELESS_SEC,
-	  setting_alias_writer },
 	{ NM_SETTING_WIRELESS_SETTING_NAME,
 	  NM_SETTING_WIRELESS_MAC_ADDRESS,
 	  mac_address_writer },