diff --git a/build-constraints.yaml b/build-constraints.yaml
index d2613ae9..bbd8c781 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1578,7 +1578,7 @@ packages:
         - hasql-pool
         - hasql-th < 0 # 0.4.0.9 TH compile error
         - hasql-transaction
-        - headed-megaparsec < 0.2.0.2 # https://github.com/commercialhaskell/stackage/issues/6348
+        - headed-megaparsec
         - jsonifier
         - list-t
         - mtl-prelude
@@ -1589,8 +1589,8 @@ packages:
         - postgresql-syntax
         - primitive-extras
         - ptr-poker
-        - rebase < 1.14 # https://github.com/commercialhaskell/stackage/issues/6348
-        - rerebase < 1.14 # https://github.com/commercialhaskell/stackage/issues/6348
+        - rebase
+        - rerebase
         - slave-thread
         - stm-containers
         - stm-hamt
@@ -6748,6 +6748,9 @@ packages:
       - hashtables < 1.3
 
       # https://github.com/commercialhaskell/stackage/issues/6348
+      - headed-megaparsec < 0.2.0.2
+      - rebase < 1.14
+      - rerebase < 1.14
       - selective < 0.5
       - yaml-unscrambler < 0.1.0.5