Mostly reverts my previous commit. svn path=/nixos/trunk/; revision=21099
svn path=/nixos/trunk/; revision=21015
svn path=/nixos/trunk/; revision=17005