diff --git a/core/nss/0001-Remove-ARM-AES-from-freebl-gyp.patch b/core/nss/0001-Remove-ARM-AES-from-freebl-gyp.patch
deleted file mode 100644
index b1d5d024f..000000000
--- a/core/nss/0001-Remove-ARM-AES-from-freebl-gyp.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 724bf0ea861fba941b0f7be3256e8b26dbcaa154 Mon Sep 17 00:00:00 2001
-From: Kevin Mihelich <kevin@archlinuxarm.org>
-Date: Mon, 21 Oct 2019 12:14:13 -0600
-Subject: [PATCH] Remove ARM AES from freebl gyp
-
----
- lib/freebl/freebl.gyp | 68 -------------------------------------------
- 1 file changed, 68 deletions(-)
-
-diff --git a/lib/freebl/freebl.gyp b/lib/freebl/freebl.gyp
-index 39506921c..8eb5162eb 100644
---- a/lib/freebl/freebl.gyp
-+++ b/lib/freebl/freebl.gyp
-@@ -116,51 +116,6 @@
-         }]
-       ]
-     },
--    {
--      'target_name': 'gcm-aes-aarch64_c_lib',
--      'type': 'static_library',
--      'sources': [
--        'gcm-aarch64.c'
--      ],
--      'dependencies': [
--        '<(DEPTH)/exports.gyp:nss_exports'
--      ],
--      'cflags': [
--        '-march=armv8-a+crypto'
--      ],
--      'cflags_mozilla': [
--        '-march=armv8-a+crypto'
--      ]
--    },
--    {
--      'target_name': 'armv8_c_lib',
--      'type': 'static_library',
--      'sources': [
--        'aes-armv8.c',
--      ],
--      'dependencies': [
--        '<(DEPTH)/exports.gyp:nss_exports'
--      ],
--      'conditions': [
--        [ 'target_arch=="arm"', {
--          'cflags': [
--            '-march=armv8-a',
--            '-mfpu=crypto-neon-fp-armv8'
--          ],
--          'cflags_mozilla': [
--            '-march=armv8-a',
--            '-mfpu=crypto-neon-fp-armv8'
--          ],
--        }, 'target_arch=="arm64" or target_arch=="aarch64"', {
--          'cflags': [
--            '-march=armv8-a+crypto'
--          ],
--          'cflags_mozilla': [
--            '-march=armv8-a+crypto'
--          ],
--        }]
--      ]
--    },
-     {
-       'target_name': 'freebl',
-       'type': 'static_library',
-@@ -189,15 +144,6 @@
-           'dependencies': [
-             'gcm-aes-x86_c_lib',
-           ],
--        }, 'disable_arm_hw_aes==0 and (target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64")', {
--          'dependencies': [
--            'armv8_c_lib'
--          ],
--        }],
--        [ 'target_arch=="arm64" or target_arch=="aarch64"', {
--          'dependencies': [
--            'gcm-aes-aarch64_c_lib',
--          ],
-         }],
-         [ 'OS=="linux"', {
-           'defines!': [
-@@ -235,15 +181,6 @@
-           'dependencies': [
-             'gcm-aes-x86_c_lib',
-           ]
--        }, 'target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64"', {
--          'dependencies': [
--            'armv8_c_lib',
--          ],
--        }],
--        [ 'target_arch=="arm64" or target_arch=="aarch64"', {
--          'dependencies': [
--            'gcm-aes-aarch64_c_lib',
--          ],
-         }],
-         [ 'OS!="linux"', {
-           'conditions': [
-@@ -468,11 +405,6 @@
-               'ARMHF',
-             ],
-           }],
--          [ 'disable_arm_hw_aes==0 and (target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64")', {
--            'defines': [
--              'USE_HW_AES',
--            ],
--          }],
-         ],
-       }],
-     ],
--- 
-2.23.0
-
diff --git a/core/nss/PKGBUILD b/core/nss/PKGBUILD
index 39881b784..f23da901a 100644
--- a/core/nss/PKGBUILD
+++ b/core/nss/PKGBUILD
@@ -3,7 +3,6 @@
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - remove -march=armv8-a in AArch64 CFLAGS to not conflict with -march=armv8-a+crypto being added
 #    this is a stupid, dirty hack that shouldn't be necessary
-#  - patch to remove armv8-specific code in freebl so that other architectures can build
 
 pkgbase=nss
 pkgname=(nss ca-certificates-mozilla)
@@ -18,8 +17,7 @@ depends=("nspr>=${_nsprver}" sqlite zlib sh p11-kit)
 makedepends=(perl python gyp)
 source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz"
         nss-3.47-certdb-temp-cert.patch
-        certdata2pem.py bundle.sh
-        0001-Remove-ARM-AES-from-freebl-gyp.patch)
+        certdata2pem.py bundle.sh)
 sha256sums=('3f9c822a86a4e3e1bfe63e2ed0f922d8b7c2e0b7cafe36774b1c627970d0f8ac'
             'bd16ba87e5ea736888f76dd54dff18b25ca6608245c0195fb85bad3d782db73c'
             '0be02cecc27a6e55e1cad1783033b147f502b26f9fb1bb5a53e7a43bbcb68fa0'
@@ -35,10 +33,6 @@ prepare() {
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1593167
   patch -d nss -Np1 < ../nss-3.47-certdb-temp-cert.patch
-
-  if [[ $CARCH != "aarch64" ]]; then
-    patch -p1 -d nss -i $srcdir/0001-Remove-ARM-AES-from-freebl-gyp.patch
-  fi
 }
 
 build() {