Removing it after a couple sprints seems reasonable to me, fwiw.  I do think we should have it in there temporarily, though -- I bet lots of people don't clear prefs routinely and will hit the issue I saw given enough time (and I think the end result is that we just stop remembering pref changes without warning).