This reverts commit 73f4c2bdf89ca02d70e614631531af307d056fef.
svn path=/nixpkgs/trunk/; revision=14542