This is a stdenv-rebuild, and should not be merged into master This reverts commit 8929989614.
8929989614