diff --git a/build-constraints.yaml b/build-constraints.yaml
index fa1f5f57..2f8b4796 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -58,7 +58,7 @@ packages:
         - safe-foldable
 
     "Jaro Reinders <jaro.reinders@gmail.com> @Noughtmare":
-        - haskell-lsp-client < 0 # GHC 8.4 via haskell-lsp
+        - haskell-lsp-client # 0 # GHC 8.4 via haskell-lsp
 
     "Florian Knupfer <fknupfer@gmail.com> @knupfer":
         - type-of-html
@@ -456,7 +456,7 @@ packages:
 
     "Alan Zimmerman @alanz":
         - ghc-exactprint
-        - haskell-lsp # 0 # GHC 8.4 via base-4.11.0.0
+        - haskell-lsp
         - hjsmin
         - language-javascript
         - Strafunski-StrategyLib
@@ -2111,7 +2111,7 @@ packages:
         - charsetdetect-ae
         - compiler-warnings
         - docopt
-        - dynamic-state # 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build
+        - dynamic-state
         - dyre
         - io-storage
         - oo-prototypes
@@ -2119,19 +2119,19 @@ packages:
         - unordered-intmap
         - word-trie
         - xdg-basedir
-        - yi-core # 0 # GHC 8.4 via dynamic-state
-        - yi-frontend-vty # 0 # GHC 8.4 via yi-rope
-        - yi-fuzzy-open # 0 # GHC 8.4 via yi-rope
-        - yi-ireader # 0 # GHC 8.4 via yi-rope
-        - yi-keymap-cua # 0 # GHC 8.4 via yi-rope
-        - yi-keymap-emacs # 0 # GHC 8.4 via yi-rope
-        - yi-keymap-vim # 0 # GHC 8.4 via yi-rope
+        - yi-core < 0 # GHC 8.4 build failure
+        - yi-frontend-vty < 0 # GHC 8.4 via yi-core
+        - yi-fuzzy-open < 0 # GHC 8.4 via yi-core
+        - yi-ireader < 0 # GHC 8.4 via yi-core
+        - yi-keymap-cua < 0 # GHC 8.4 via yi-core
+        - yi-keymap-emacs < 0 # GHC 8.4 via yi-core
+        - yi-keymap-vim < 0 # GHC 8.4 via yi-core
         - yi-language
-        - yi-misc-modes # 0 # GHC 8.4 via yi-rope
-        - yi-mode-haskell # 0 # GHC 8.4 via yi-rope
-        - yi-mode-javascript # 0 # GHC 8.4 via yi-rope
-        - yi-rope # 0 # build failure with GHC 8.4 https://github.com/yi-editor/yi-rope/issues/17
-        - yi-snippet # 0 # GHC 8.4 via yi-rope
+        - yi-misc-modes < 0 # GHC 8.4 via yi-core
+        - yi-mode-haskell < 0 # GHC 8.4 via yi-core
+        - yi-mode-javascript < 0 # GHC 8.4 via yi-core
+        - yi-rope
+        - yi-snippet < 0 # GHC 8.4 via yi-core
 
     "Tobias Bexelius <tobias_bexelius@hotmail.com> @tobbebex":
         - GPipe < 0 # GHC 8.4 via base-4.11.0.0