diff --git a/build-constraints.yaml b/build-constraints.yaml
index e231798b..0a47eb07 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -1480,78 +1480,6 @@ packages:
     "Jan Stolarek <jan.stolarek@p.lodz.pl> @jstolarek":
         - tasty-program
 
-    "Oleg Grenrus <oleg.grenrus@iki.fi> @phadej":
-        - aeson-compat
-        - aeson-extra
-        - base64-bytestring-type
-        - binary-orphans
-        - binary-tagged
-        - boring
-        - cabal-doctest
-        - crypt-sha512
-        - dlist-nonempty
-        - edit-distance
-        - fin
-        - functor-classes-compat
-        - generics-sop-lens
-        - github
-        - insert-ordered-containers
-        - integer-logarithms
-        - JuicyPixels-scale-dct
-        - kleene
-        - lattices
-        - microstache
-        - OneTuple
-        - postgresql-simple-url
-        - range-set-list
-        - regex-applicative-text
-        - servant-dhall < 0
-        - servant-swagger-ui
-        - servant-swagger-ui-core
-        - servant-swagger-ui-redoc
-        - servant-yaml
-        - singleton-bool
-        - spdx < 0 # needs QuickCheck 2.12
-        - splitmix
-        - step-function
-        - tdigest
-        - these
-        - time-parsers
-        - tree-diff
-        - vec
-
-        # scrive/log
-        - log < 0 # via log-elasticsearch
-        - log-base
-        - log-elasticsearch < 0 # via bloodhound
-        - log-postgres < 0
-
-        # Not a maintainer
-        - folds
-        - friendly-time
-        - hashable
-        - haxl
-        - monad-time
-        - packdeps < 0
-        - recursion-schemes < 5.1.1.1 || > 5.1.1.1
-        - unordered-containers
-
-        # Regex packages by Chris Kuklewicz
-        - regex-base
-        - regex-compat
-        - regex-pcre
-        - regex-posix
-        - regex-tdfa
-
-        # Universe
-        - universe
-        - universe-base
-        - universe-dependent-sum
-        - universe-instances-base
-        - universe-instances-extended
-        - universe-instances-trans
-        - universe-reverse-instances
-
     "Abhinav Gupta <mail@abhinavg.net> @abhinav":
         - farmhash
         - pinch < 0 # BuildFailureException Process exited with ExitFailure 1: ./Setup build
@@ -3914,14 +3842,18 @@ packages:
         - HTTP
         - HsOpenSSL
         - HsYAML
+        - JuicyPixels-scale-dct
         - ListLike
         - MemoTrie
         - NumInstances
+        - OneTuple
         - Only
         - ParsecTools
         - QuickCheck
         - RSA
         - X11
+        - aeson-compat
+        - aeson-extra
         - alsa-mixer
         - ansi-terminal
         - appar
@@ -3933,14 +3865,18 @@ packages:
         - authenticate
         - auto-update
         - base64-bytestring
+        - base64-bytestring-type
         - base64-string
         - bimap
+        - binary-orphans
         - binary-parser
+        - binary-tagged
         - bindings-DSL
         - bitarray
         - blaze-builder
         - blaze-svg
         - blaze-textual
+        - boring
         - brick
         - buffer-builder
         - byteable
@@ -3949,6 +3885,7 @@ packages:
         - bytestring-tree-builder
         - bzlib
         - ca-province-codes
+        - cabal-doctest
         - call-stack
         - casing
         - cassava-megaparsec
@@ -3977,6 +3914,7 @@ packages:
         - convertible
         - cookie
         - cpphs
+        - crypt-sha512
         - crypto-api
         - crypto-api-tests
         - crypto-cipher-tests
@@ -4018,12 +3956,14 @@ packages:
         - discount
         - dlist
         - dlist-instances
+        - dlist-nonempty
         - dotgen
         - double-conversion
         - dual-tree
         - easy-file
         - easytest
         - ed25519
+        - edit-distance
         - enclosed-exceptions
         - entropy
         - erf
@@ -4039,23 +3979,30 @@ packages:
         - file-embed
         - file-embed-lzma
         - filemanip
+        - fin
         - fingertree
         - fmlist
+        - friendly-time
+        - functor-classes-compat
         - generic-arbitrary
+        - generics-sop-lens
         - ghc-compact
         - ghc-paths
         - ghc-prof
         - gi-gdk
         - gi-gdkpixbuf
         - gi-pango
+        - github
         - groom
         - groups
         - hackage-security
+        - hashable
         - haskell-gi-overloading
         - haskell-lexer
         - haskell-lsp-types
         - haskell-src
         - haskell-src-exts
+        - haxl
         - heap
         - hex
         - hint
@@ -4092,20 +4039,25 @@ packages:
         - iconv
         - ieee754
         - infer-license
+        - insert-ordered-containers
         - inspection-testing
+        - integer-logarithms
         - io-streams-haproxy
         - ip
         - ixset-typed
         - json
         - json-alt
+        - kleene
         - language-haskell-extract
         - largeword
+        - lattices
         - lazy-csv
         - libyaml
         - lifted-async
         - lifted-base
         - loch-th
         - lockfree-queue
+        - log-base
         - logging-facade
         - lrucache
         - lzma
@@ -4114,12 +4066,14 @@ packages:
         - math-functions
         - mersenne-random-pure64
         - mfsolve
+        - microstache
         - mmap
         - mmorph
         - mockery
         - monad-control
         - monad-logger
         - monad-loops
+        - monad-time
         - monads-tf
         - mono-traversable-instances
         - mono-traversable-keys
@@ -4153,6 +4107,7 @@ packages:
         - polyparse
         - postgresql-libpq
         - postgresql-simple
+        - postgresql-simple-url
         - pretty-hex
         - pretty-show
         - prettyprinter-convert-ansi-wl-pprint
@@ -4170,10 +4125,18 @@ packages:
         - quickcheck-unicode
         - random
         - random-shuffle
+        - range-set-list
         - raw-strings-qq
         - readable
         - rebase
+        - recursion-schemes
+        - regex-applicative-text
+        - regex-base
+        - regex-compat
+        - regex-pcre
         - regex-pcre-builtin
+        - regex-posix
+        - regex-tdfa
         - regex-tdfa-text
         - relapse
         - relational-schemas
@@ -4188,12 +4151,17 @@ packages:
         - securemem
         - serialise
         - servant-client-core
+        - servant-swagger-ui
+        - servant-swagger-ui-core
+        - servant-swagger-ui-redoc
+        - servant-yaml
         - setenv
         - shakespeare
         - shell-escape
         - silently
         - simple-reflect
         - simple-sendfile
+        - singleton-bool
         - singleton-nats
         - size-based
         - skein
@@ -4202,10 +4170,12 @@ packages:
         - special-values
         - splice
         - split
+        - splitmix
         - sql-words
         - srcloc
         - stateref
         - statistics
+        - step-function
         - stm-delay
         - stm-hamt
         - storable-complex
@@ -4223,6 +4193,7 @@ packages:
         - tabular
         - tar
         - tasty-th
+        - tdigest
         - temporary
         - temporary-rc
         - temporary-resourcet
@@ -4244,27 +4215,39 @@ packages:
         - th-extras
         - th-lift-instances
         - th-utilities
+        - these
         - threads
         - thyme
         - time-locale-compat
+        - time-parsers
         - timeit
         - tls-session-manager
         - token-bucket
         - tonatona
         - transformers-base
+        - tree-diff
         - true-name
         - tuple-th
         - type-fun
         - type-hint
         - uglymemo
         - unbounded-delays
+        - universe
+        - universe-base
+        - universe-dependent-sum
+        - universe-instances-base
+        - universe-instances-extended
+        - universe-instances-trans
+        - universe-reverse-instances
         - unix-compat
         - unix-time
+        - unordered-containers
         - url
         - utf8-light
         - utf8-string
         - uuid-types
         - vault
+        - vec
         - vector
         - vector-algorithms
         - vector-binary-instances