Backout pref changes made by mistake in f955ea0b3117, r+a+l10n=backout.