Making the old Vista stuff automatic, in preparation for deleting it.