Api change breaks dependencies. This reverts commit d3b47ef72575ccf2f1c885d325f2e3427e7abe2b.
svn path=/nixpkgs/trunk/; revision=22436