Reverts r18418. svn path=/nixpkgs/trunk/; revision=19254
svn path=/nixpkgs/trunk/; revision=18418
svn path=/nixpkgs/trunk/; revision=17994