diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index cf40b73a9..ba81a19b9 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -12,8 +12,6 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - added switches for our architectures
-#  - cherry-pick upstream commit to fix multiple definition linker error
-#    https://github.com/golang/go/issues/9510
 
 pkgname=('go' 'go-tools')
 epoch=2
@@ -28,11 +26,6 @@ source=("$pkgname-$pkgver::git+https://go.googlesource.com/go#tag=$pkgname$pkgve
 md5sums=('SKIP')
 _gourl=golang.org/x/tools/cmd
 
-prepare() {
-  cd "$pkgname-$pkgver/src"
-  git cherry-pick -n 754f707f5f6b870892b78814bac4f90086312039
-}
-
 build() {
   cd "$pkgname-$pkgver/src"