This reverts r31196. Will re-apply after fixing most packages broken by this change. svn path=/nixpkgs/trunk/; revision=31203
This reverts r31196. Will re-apply after fixing most packages broken by this change. svn path=/nixpkgs/trunk/; revision=31203