This reverts commit 50429b2b63a3ad540e8fcd96be0cdaac46a27da2. svn path=/nixpkgs/trunk/; revision=21407