This reverts commit 78182194c6.
78182194c6
Moving to staging, as it causes lots of rebuilds and it doesn't seem urgent. This reverts commit d6fb907269, reversing changes made to 600b02324c.
d6fb907269
600b02324c
https://github.com/NixOS/nixpkgs/issues/34987