This changes in the later settings patch. Suggest apply these changes as a follow-up, perhaps with unit tests. How about a 'Improve Settings unit test coverage' follow-up bug?