diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index df0462d29b..96ba4a7c4a 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -647,14 +647,6 @@ EOD;
 
 				if (!empty($ph1ent['pre-shared-key'])) {
 					$pskconf .= "{$myid} {$peerid} : PSK 0s" . base64_encode(trim($ph1ent['pre-shared-key'])) . "\n";
-
-					/*
-					 * XXX: Remove after following strongswan issue is fixed:
-					 *https://wiki.strongswan.org/issues/1004
-					 */
-					if ($peerid_type == 'address' && is_fqdn($ph1ent['remote-gateway'])) {
-						$pskconf .= "{$myid} @{$ph1ent['remote-gateway']} : PSK 0s" . base64_encode(trim($ph1ent['pre-shared-key'])) . "\n";
-					}
 				}
 			}
 		}