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