These should eventually be rolled back into configspec.ini as per my earlier comment, but I don't think it's necessary to hold up this pull request to do it.