diff --git a/ed25519_test.go b/ed25519_test.go
index 0b4651e..193d00f 100644
--- a/ed25519_test.go
+++ b/ed25519_test.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/agl/ed25519/edwards25519"
+	"github.com/tendermint/ed25519/edwards25519"
 )
 
 type zeroReader struct{}
diff --git a/edwards25519/edwards25519.go b/edwards25519/edwards25519.go
index 9079818..f2d0ef2 100644
--- a/edwards25519/edwards25519.go
+++ b/edwards25519/edwards25519.go
@@ -19,12 +19,34 @@ type FieldElement [10]int32
 var zero FieldElement
 
 func FeZero(fe *FieldElement) {
-	copy(fe[:], zero[:])
+	// Unrolled version of:
+	// copy(fe[:], zero[:])
+	fe[0] = 0
+	fe[1] = 0
+	fe[2] = 0
+	fe[3] = 0
+	fe[4] = 0
+	fe[5] = 0
+	fe[6] = 0
+	fe[7] = 0
+	fe[8] = 0
+	fe[9] = 0
 }
 
 func FeOne(fe *FieldElement) {
-	FeZero(fe)
+	// Unrolled version of
+	// FeZero(fe)
+	// fe[0] = 1
 	fe[0] = 1
+	fe[1] = 0
+	fe[2] = 0
+	fe[3] = 0
+	fe[4] = 0
+	fe[5] = 0
+	fe[6] = 0
+	fe[7] = 0
+	fe[8] = 0
+	fe[9] = 0
 }
 
 func FeAdd(dst, a, b *FieldElement) {