diff --git a/gopls/internal/lsp/fake/sandbox.go b/gopls/internal/lsp/fake/sandbox.go
index e4da6289d1c..018bace3b30 100644
--- a/gopls/internal/lsp/fake/sandbox.go
+++ b/gopls/internal/lsp/fake/sandbox.go
@@ -13,8 +13,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"golang.org/x/tools/gopls/internal/robustio"
 	"golang.org/x/tools/internal/gocommand"
+	"golang.org/x/tools/internal/robustio"
 	"golang.org/x/tools/internal/testenv"
 	"golang.org/x/tools/txtar"
 )
diff --git a/gopls/internal/lsp/fake/workdir.go b/gopls/internal/lsp/fake/workdir.go
index 8f0e796b046..19907ada655 100644
--- a/gopls/internal/lsp/fake/workdir.go
+++ b/gopls/internal/lsp/fake/workdir.go
@@ -19,8 +19,8 @@ import (
 	"time"
 
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
-	"golang.org/x/tools/gopls/internal/robustio"
 	"golang.org/x/tools/gopls/internal/span"
+	"golang.org/x/tools/internal/robustio"
 )
 
 // RelativeTo is a helper for operations relative to a given directory.
diff --git a/gopls/internal/lsp/filecache/filecache.go b/gopls/internal/lsp/filecache/filecache.go
index 838a99e6202..15160c7c2a6 100644
--- a/gopls/internal/lsp/filecache/filecache.go
+++ b/gopls/internal/lsp/filecache/filecache.go
@@ -31,7 +31,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"golang.org/x/tools/gopls/internal/robustio"
+	"golang.org/x/tools/internal/robustio"
 )
 
 // Get retrieves from the cache and returns a newly allocated
diff --git a/gopls/internal/robustio/copyfiles.go b/internal/robustio/copyfiles.go
similarity index 100%
rename from gopls/internal/robustio/copyfiles.go
rename to internal/robustio/copyfiles.go
diff --git a/gopls/internal/robustio/gopls_windows.go b/internal/robustio/gopls_windows.go
similarity index 100%
rename from gopls/internal/robustio/gopls_windows.go
rename to internal/robustio/gopls_windows.go
diff --git a/gopls/internal/robustio/robustio.go b/internal/robustio/robustio.go
similarity index 100%
rename from gopls/internal/robustio/robustio.go
rename to internal/robustio/robustio.go
diff --git a/gopls/internal/robustio/robustio_darwin.go b/internal/robustio/robustio_darwin.go
similarity index 100%
rename from gopls/internal/robustio/robustio_darwin.go
rename to internal/robustio/robustio_darwin.go
diff --git a/gopls/internal/robustio/robustio_flaky.go b/internal/robustio/robustio_flaky.go
similarity index 100%
rename from gopls/internal/robustio/robustio_flaky.go
rename to internal/robustio/robustio_flaky.go
diff --git a/gopls/internal/robustio/robustio_other.go b/internal/robustio/robustio_other.go
similarity index 100%
rename from gopls/internal/robustio/robustio_other.go
rename to internal/robustio/robustio_other.go
diff --git a/gopls/internal/robustio/robustio_posix.go b/internal/robustio/robustio_posix.go
similarity index 100%
rename from gopls/internal/robustio/robustio_posix.go
rename to internal/robustio/robustio_posix.go
diff --git a/gopls/internal/robustio/robustio_test.go b/internal/robustio/robustio_test.go
similarity index 97%
rename from gopls/internal/robustio/robustio_test.go
rename to internal/robustio/robustio_test.go
index 31c9bdae6de..5f9fcd9a68f 100644
--- a/gopls/internal/robustio/robustio_test.go
+++ b/internal/robustio/robustio_test.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"golang.org/x/tools/gopls/internal/robustio"
+	"golang.org/x/tools/internal/robustio"
 )
 
 func TestFileID(t *testing.T) {
diff --git a/gopls/internal/robustio/robustio_windows.go b/internal/robustio/robustio_windows.go
similarity index 100%
rename from gopls/internal/robustio/robustio_windows.go
rename to internal/robustio/robustio_windows.go