diff --git a/build-constraints.yaml b/build-constraints.yaml
index 09fba0e1..268db100 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -298,8 +298,7 @@ packages:
         - gl
         - lens-aeson
         - zlib-lens
-        # Temporary upper bound for some of the above packages
-        - generic-deriving < 1.7
+        - generic-deriving
         # hyperloglog
 
     "Andrew Farmer <afarmer@ittc.ku.edu>":
@@ -884,6 +883,9 @@ packages:
         - exception-transformers < 0.4
         - exception-mtl < 0.4
 
+        # https://github.com/fpco/stackage/issues/517
+        - generic-deriving < 1.7
+
 # Package flags are applied to individual packages, and override the values of
 # global-flags
 package-flags: