This reverts commit fac80449abd57c271dfb98d392e49e4135dfc50c. svn path=/nixpkgs/branches/stdenv-updates/; revision=32663