Revert "Bug 717062 - Root preferences branch for simple-prefs needs to be configurable r=@erikvold"

This reverts commit 0249e4b940cd5570ca20f062231f1b1ffc003be1, reversing
changes made to e050ccdb90aaf07d3d3a05331a5bdcbb0ab6f193.