Revert "More of trying to get settings working."

This reverts commit 23013ada0953820d1efc84f3b26ca1da6dcb3d7f.