This commit breaks hydra evaluation for some reason, but it works locally for some reason... This reverts commit 3ba002080ab1d8e28ca1b824de01a5156487735f. svn path=/nixpkgs/trunk/; revision=30355