This reverts commit 413c44da228754018a2920cb556303e803a9d488. svn path=/nixpkgs/branches/stdenv-updates/; revision=32643