Revert "Merge pull request #368 from bobsilverberg/settings"

This reverts commit fabaa57a3cdd4e79c5b13f309f02652049900809, reversing
changes made to 9b42e4d7614318163d9471655aecfac5a1d62734.

@stephendonner: If you need to revert the SpecialPowers pull, you can merge this.