This reverts commit dca280ab0b668553c50506ab7b31284e8477a803. svn path=/nixpkgs/branches/stdenv-updates/; revision=32660