This reverts commit 614b18668433329cc5686c34b51a63e51c86c9f4. svn path=/nixpkgs/branches/stdenv-updates/; revision=32650