This reverts commit ebe85f30fa075507313fc9dfa6ceb96501c6e332. svn path=/nixpkgs/trunk/; revision=31537