diff --git a/lang/go118/Makefile b/lang/go118/Makefile
index 76c33efd3968..2eae4e7b4bd4 100644
--- a/lang/go118/Makefile
+++ b/lang/go118/Makefile
@@ -1,22 +1,22 @@
 # Created by: Devon H. O'Dell <devon.odell@gmail.com>
 
 DISTVERSION=	1.18.4
 # Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel
-PORTREVISION=	0
+PORTREVISION=	1
 MASTER_SITES=	https://golang.org/dl/ \
 		https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
 		LOCAL/dmgk:bootstrap
 DISTFILES=	go${DISTVERSION}.src.tar.gz \
 		go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap
 
 # Avoid conflicting patch files
 PATCHFILES=
 
 COMMENT=	Go programming language
 
 MASTERDIR=	${.CURDIR}/../go-devel
 PATCHDIR=	${.CURDIR}/files
 WRKSRC=		${WRKDIR}/go
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/go118/files/patch-src_cmd_compile_internal_noder_stencil.go b/lang/go118/files/patch-src_cmd_compile_internal_noder_stencil.go
new file mode 100644
index 000000000000..350f3e289af8
--- /dev/null
+++ b/lang/go118/files/patch-src_cmd_compile_internal_noder_stencil.go
@@ -0,0 +1,18 @@
+Revert "[release-branch.go1.18] cmd/compile: fix missing dict pass for type assertions"
+https://go-review.googlesource.com/c/go/+/417615
+
+--- src/cmd/compile/internal/noder/stencil.go.orig	2022-07-12 15:22:53 UTC
++++ src/cmd/compile/internal/noder/stencil.go
+@@ -1297,10 +1297,10 @@ func (g *genInst) dictPass(info *instInfo) {
+ 				m = convertUsingDictionary(info, info.dictParam, m.Pos(), mce.X, m, m.Type(), false)
+ 			}
+ 		case ir.ODOTTYPE, ir.ODOTTYPE2:
+-			dt := m.(*ir.TypeAssertExpr)
+-			if !dt.Type().HasShape() && !dt.X.Type().HasShape() {
++			if !m.Type().HasShape() {
+ 				break
+ 			}
++			dt := m.(*ir.TypeAssertExpr)
+ 			var rt ir.Node
+ 			if dt.Type().IsInterface() || dt.X.Type().IsEmptyInterface() {
+ 				ix := findDictType(info, m.Type())