This reverts commit af32fd6ce3ce2ae138c2fc2bc5c6067216f8b828.
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25247