Bug 1089459 - [Settings] Performance regression on bug 1066830