This reverts commit 8a2cd2c99f26e5bd5c5a324e2a1712db8991379e. svn path=/nixpkgs/trunk/; revision=23856