diff --git a/core/crypto/ed25519.go b/core/crypto/ed25519.go
index ceb348379..1707e7509 100644
--- a/core/crypto/ed25519.go
+++ b/core/crypto/ed25519.go
@@ -2,14 +2,13 @@ package crypto
 
 import (
 	"bytes"
+	"crypto/ed25519"
 	"crypto/subtle"
 	"errors"
 	"fmt"
 	"io"
 
 	pb "github.com/libp2p/go-libp2p-core/crypto/pb"
-
-	"golang.org/x/crypto/ed25519"
 )
 
 // Ed25519PrivateKey is an ed25519 private key.
diff --git a/core/crypto/ed25519_test.go b/core/crypto/ed25519_test.go
index 222b5154b..ae1bebe76 100644
--- a/core/crypto/ed25519_test.go
+++ b/core/crypto/ed25519_test.go
@@ -1,12 +1,11 @@
 package crypto
 
 import (
+	"crypto/ed25519"
 	"crypto/rand"
 	"testing"
 
 	pb "github.com/libp2p/go-libp2p-core/crypto/pb"
-
-	"golang.org/x/crypto/ed25519"
 )
 
 func TestBasicSignAndVerify(t *testing.T) {
diff --git a/core/crypto/key_not_openssl.go b/core/crypto/key_not_openssl.go
index ae8b01f00..6b5b6fc2c 100644
--- a/core/crypto/key_not_openssl.go
+++ b/core/crypto/key_not_openssl.go
@@ -5,10 +5,10 @@ package crypto
 import (
 	"crypto"
 	"crypto/ecdsa"
+	"crypto/ed25519"
 	"crypto/rsa"
 
 	btcec "github.com/btcsuite/btcd/btcec"
-	"golang.org/x/crypto/ed25519"
 )
 
 // KeyPairFromStdKey wraps standard library (and secp256k1) private keys in libp2p/go-libp2p-core/crypto keys
diff --git a/core/crypto/key_openssl.go b/core/crypto/key_openssl.go
index 4545492cf..b948f3d08 100644
--- a/core/crypto/key_openssl.go
+++ b/core/crypto/key_openssl.go
@@ -5,12 +5,12 @@ package crypto
 import (
 	"crypto"
 	"crypto/ecdsa"
+	"crypto/ed25519"
 	"crypto/rsa"
 	"crypto/x509"
 
 	btcec "github.com/btcsuite/btcd/btcec"
 	openssl "github.com/libp2p/go-openssl"
-	"golang.org/x/crypto/ed25519"
 )
 
 // KeyPairFromStdKey wraps standard library (and secp256k1) private keys in libp2p/go-libp2p-core/crypto keys
diff --git a/core/crypto/key_test.go b/core/crypto/key_test.go
index aff2badd4..984eaa119 100644
--- a/core/crypto/key_test.go
+++ b/core/crypto/key_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"crypto"
 	"crypto/ecdsa"
+	"crypto/ed25519"
 	"crypto/elliptic"
 	"crypto/rand"
 	"crypto/rsa"
@@ -15,7 +16,6 @@ import (
 	pb "github.com/libp2p/go-libp2p-core/crypto/pb"
 	"github.com/libp2p/go-libp2p-core/test"
 	sha256 "github.com/minio/sha256-simd"
-	"golang.org/x/crypto/ed25519"
 )
 
 func TestKeys(t *testing.T) {