diff --git a/Makefile b/Makefile
index 0302be9..cdf23ca 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 # Copyright 2021 Joyent, Inc.
+# Copyright 2024 MNX Cloud, Inc.
 
 SCRIPT=		deps/dehydrated/dehydrated
 ARCHIVE=	dehydrated.tar.gz
@@ -11,7 +12,7 @@ VERSION=	$(shell git tag --sort=taggerdate | tail -1)
 # Prevent macOS from putting resource forks in the tar
 export COPYFILE_DISABLE=true
 
-.PHONY: archive patch release subclean
+.PHONY: archive release subclean
 archive: $(ARCHIVE)
 
 release: clean .version $(ARCHIVE)
@@ -21,10 +22,9 @@ release: clean .version $(ARCHIVE)
 	echo "$(VERSION)" > $@
 	git rev-parse HEAD 2>/dev/null >> $@
 
-$(ARCHIVE): clean $(SCRIPT) patch .version
+$(ARCHIVE): clean $(SCRIPT) .version
 	find . -type f \
 	    -not -path '*/.git/*' \
-	    -not -path '*/PATCHES/*' \
 	    -not -name '.git*' \
 	    -not -name '.travis.yml' \
 	    -not -name 'Makefile' \
@@ -34,11 +34,6 @@ $(ARCHIVE): clean $(SCRIPT) patch .version
 $(SCRIPT):
 	git submodule init && git submodule update
 
-# This is a temporary hack to work around an upstream bug. We want a better
-# way to handle this.
-patch: $(SCRIPT)
-	patch -p1 $< < PATCHES/000-fix-grep.patch
-
 subclean:
 	git submodule foreach --recursive git reset --hard
 
diff --git a/PATCHES/000-fix-grep.patch b/PATCHES/000-fix-grep.patch
deleted file mode 100644
index 830c512..0000000
--- a/PATCHES/000-fix-grep.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 3e063cc41cb03eada7ed7e56577db8b0c584d9fa
-Author: Brian Bennett <bahamat@digitalelf.net>
-Date:   Mon Sep 20 15:25:18 2021 -0700
-
-    Better handling around grep/awk
-
-diff --git a/dehydrated b/dehydrated
-index d61807e..1e01d2b 100755
---- a/dehydrated
-+++ b/dehydrated
-@@ -88,7 +88,7 @@ jsonsh() {
-   awk_egrep () {
-     local pattern_string=$1
- 
--    gawk '{
-+    awk '{
-       while ($0) {
-         start=match($0, pattern);
-         token=substr($0, start, RLENGTH);
-@@ -110,7 +110,7 @@ jsonsh() {
-       GREP='egrep -ao'
-     fi
- 
--    if echo "test string" | egrep -o "test" >/dev/null 2>&1
-+    if echo "test string" | egrep -ao "test" >/dev/null 2>&1
-     then
-       ESCAPE='(\\[^u[:cntrl:]]|\\u[0-9a-fA-F]{4})'
-       CHAR='[^[:cntrl:]"\\]'
diff --git a/cns-hook-util b/cns-hook-util
index 027b20b..d0bab1b 100755
--- a/cns-hook-util
+++ b/cns-hook-util
@@ -5,7 +5,7 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 # Copyright 2021 Joyent, Inc.
-# Copyright 2023 MNX Cloud, Inc.
+# Copyright 2024 MNX Cloud, Inc.
 
 function getservice {
     local vmuuid
@@ -248,7 +248,7 @@ function clean_challenge {
                     vmadm update "$vmuuid"
                 ;;
             *)
-                # We should never hit this becuase it would have been filtered out
+                # We should never hit this because it would have been filtered out
                 # much earlier.
                 echo "ERROR: Unknown service: $vmservice"
                 ;;
diff --git a/deps/dehydrated b/deps/dehydrated
index 91cccc0..ea84199 160000
--- a/deps/dehydrated
+++ b/deps/dehydrated
@@ -1 +1 @@
-Subproject commit 91cccc0c234e4decf0a19595fa19a6f306788032
+Subproject commit ea841998631561543357f032fa7c06598c34d517