diff --git a/chacha/chachaAVX2_amd64.go b/chacha/chachaAVX2_amd64.go
index <HASH>..<HASH> 100644
--- a/chacha/chachaAVX2_amd64.go
+++ b/chacha/chachaAVX2_amd64.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a license that can be
 // found in the LICENSE file.
 
-// +build amd64, go1.7, !gccgo, !appengine, !go1.6
+// +build ignore
 
 package chacha
 
diff --git a/chacha/chachaAVX2_amd64.s b/chacha/chachaAVX2_amd64.s
index <HASH>..<HASH> 100644
--- a/chacha/chachaAVX2_amd64.s
+++ b/chacha/chachaAVX2_amd64.s
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a license that can be
 // found in the LICENSE file.
 
-// +build amd64, go1.7, !gccgo, !appengine, !go1.6
+// +build ignore
 
 #include "textflag.h"
 
diff --git a/chacha/chachaSSE_amd64.go b/chacha/chachaSSE_amd64.go
index <HASH>..<HASH> 100644
--- a/chacha/chachaSSE_amd64.go
+++ b/chacha/chachaSSE_amd64.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a license that can be
 // found in the LICENSE file.
 
-// +build amd64, go1.6, !gccgo, !appengine
+// +build amd64, !gccgo, !appengine
 
 package chacha
Disable AVX2 again - Version dependend compilation needs investigation