diff --git a/.gitmodules b/.gitmodules
index 9605b4590..4e873c34d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -31,6 +31,3 @@
 	# url = https://github.com/bubba/ghc-mod.git
 	url = https://github.com/alanz/ghc-mod.git
 
-[submodule "submodules/haskell-lsp"]
-	path = submodules/haskell-lsp
-	url = https://github.com/alanz/haskell-lsp.git
diff --git a/cabal.project b/cabal.project
index db1f2999b..809c1948d 100644
--- a/cabal.project
+++ b/cabal.project
@@ -8,7 +8,5 @@ packages:
          ./submodules/ghc-mod/
          ./submodules/ghc-mod/core/
          ./submodules/ghc-mod/ghc-project-types
-         ./submodules/haskell-lsp
-         ./submodules/haskell-lsp/haskell-lsp-types
 
 tests: true
diff --git a/stack-8.2.1.yaml b/stack-8.2.1.yaml
index c1db403ff..b7cad11a4 100644
--- a/stack-8.2.1.yaml
+++ b/stack-8.2.1.yaml
@@ -10,8 +10,6 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 # - brittany-0.11.0.0
 - butcher-1.3.1.1
@@ -22,8 +20,8 @@ extra-deps:
 - ghc-exactprint-0.5.8.2
 - haddock-api-2.18.1
 - haddock-library-1.4.4
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - hlint-2.0.11
 - hsimport-0.8.8
 - lsp-test-0.5.2.2
diff --git a/stack-8.2.2.yaml b/stack-8.2.2.yaml
index 33909f50e..5eb7eed62 100644
--- a/stack-8.2.2.yaml
+++ b/stack-8.2.2.yaml
@@ -10,8 +10,6 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 # - brittany-0.11.0.0
 - butcher-1.3.1.1
@@ -23,8 +21,8 @@ extra-deps:
 - ghc-exactprint-0.5.8.2
 - haddock-api-2.18.1
 - haddock-library-1.4.4
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
 - hlint-2.1.17
diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml
index 8c752e62c..22c2be88e 100644
--- a/stack-8.4.2.yaml
+++ b/stack-8.4.2.yaml
@@ -10,8 +10,6 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 # - brittany-0.11.0.0
 - base-compat-0.9.3
@@ -21,8 +19,8 @@ extra-deps:
 - ghc-exactprint-0.5.8.2
 - haddock-api-2.20.0
 - haddock-library-1.6.0
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
 - hlint-2.1.17
diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml
index 3d00419d4..12830ad96 100644
--- a/stack-8.4.3.yaml
+++ b/stack-8.4.3.yaml
@@ -10,8 +10,6 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 - base-compat-0.9.3
 - cabal-plan-0.3.0.0
@@ -20,8 +18,8 @@ extra-deps:
 - ghc-exactprint-0.5.8.2
 - haddock-api-2.20.0
 - haddock-library-1.6.0
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
 - hlint-2.1.17
diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml
index 9d2ea176e..09605096c 100644
--- a/stack-8.4.4.yaml
+++ b/stack-8.4.4.yaml
@@ -10,8 +10,6 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 # - brittany-0.11.0.0
 - cabal-plan-0.4.0.0
@@ -20,8 +18,8 @@ extra-deps:
 - ghc-exactprint-0.5.8.2
 - haddock-api-2.20.0
 - haddock-library-1.6.0
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
 - hlint-2.1.17
diff --git a/stack-8.6.1.yaml b/stack-8.6.1.yaml
index 0f790fe28..7e5b261cf 100644
--- a/stack-8.6.1.yaml
+++ b/stack-8.6.1.yaml
@@ -10,8 +10,6 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 - apply-refact-0.6.0.0
 - butcher-1.3.2.1
@@ -22,8 +20,8 @@ extra-deps:
 - data-tree-print-0.1.0.2
 - floskell-0.10.0
 - haddock-api-2.21.0
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
 - hlint-2.1.17
diff --git a/stack-8.6.2.yaml b/stack-8.6.2.yaml
index c4436bbd9..414af8acf 100644
--- a/stack-8.6.2.yaml
+++ b/stack-8.6.2.yaml
@@ -10,16 +10,14 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 - butcher-1.3.2.1
 - cabal-plan-0.4.0.0
 - constrained-dynamic-0.1.0.0
 - floskell-0.10.0
 - haddock-api-2.21.0
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
 - hlint-2.1.17
diff --git a/stack-8.6.3.yaml b/stack-8.6.3.yaml
index c94c5337c..f0126ce4e 100644
--- a/stack-8.6.3.yaml
+++ b/stack-8.6.3.yaml
@@ -10,16 +10,14 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 - butcher-1.3.2.1
 - cabal-plan-0.4.0.0
 - constrained-dynamic-0.1.0.0
 - floskell-0.10.0
 - haddock-api-2.21.0
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - haskell-src-exts-1.21.0
 - haskell-src-exts-util-0.2.5
 - hlint-2.1.17
diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml
index 685f98618..9bc25f676 100644
--- a/stack-8.6.4.yaml
+++ b/stack-8.6.4.yaml
@@ -10,16 +10,14 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 - butcher-1.3.2.1
 - cabal-plan-0.4.0.0
 - constrained-dynamic-0.1.0.0
 - floskell-0.10.0
 - haddock-api-2.22.0
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - haskell-src-exts-1.21.0
 - hlint-2.1.17
 - hoogle-5.0.17.6
diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
index bc52b9578..29017335e 100644
--- a/stack-8.6.5.yaml
+++ b/stack-8.6.5.yaml
@@ -10,8 +10,6 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 - ansi-terminal-0.8.2
 - butcher-1.3.2.1
@@ -21,8 +19,8 @@ extra-deps:
 - floskell-0.10.0
 - ghc-exactprint-0.5.8.2
 - haddock-api-2.22.0
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - hlint-2.1.17
 - hsimport-0.8.8
 - lsp-test-0.5.2.2
diff --git a/stack.yaml b/stack.yaml
index bc52b9578..29017335e 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -10,8 +10,6 @@ extra-deps:
 - ./submodules/ghc-mod
 - ./submodules/ghc-mod/core
 - ./submodules/ghc-mod/ghc-project-types
-- ./submodules/haskell-lsp
-- ./submodules/haskell-lsp/haskell-lsp-types
 
 - ansi-terminal-0.8.2
 - butcher-1.3.2.1
@@ -21,8 +19,8 @@ extra-deps:
 - floskell-0.10.0
 - ghc-exactprint-0.5.8.2
 - haddock-api-2.22.0
-# - haskell-lsp-0.12.1.0
-# - haskell-lsp-types-0.12.1.0
+- haskell-lsp-0.12.1.0
+- haskell-lsp-types-0.12.1.0
 - hlint-2.1.17
 - hsimport-0.8.8
 - lsp-test-0.5.2.2
diff --git a/submodules/haskell-lsp b/submodules/haskell-lsp
deleted file mode 160000
index fb45245a5..000000000
--- a/submodules/haskell-lsp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fb45245a5e43a164f303c8c1d492669bd0f09fc4
diff --git a/test/functional/DeferredSpec.hs b/test/functional/DeferredSpec.hs
index 792ef929a..1ad189c25 100644
--- a/test/functional/DeferredSpec.hs
+++ b/test/functional/DeferredSpec.hs
@@ -29,7 +29,7 @@ spec = do
 
       skipMany anyNotification
       hoverRsp <- message :: Session HoverResponse
-      liftIO $ hoverRsp ^? result . _Just . _Just . contents `shouldBe` (Just HoverContentsEmpty)
+      liftIO $ hoverRsp ^? result . _Just . _Just . contents `shouldBe` Nothing
       liftIO $ hoverRsp ^. LSP.id `shouldBe` responseId id1
 
       id2 <- sendRequest TextDocumentDocumentSymbol (DocumentSymbolParams doc)