Revert "need to research this more"

This reverts commit d7ef64e4d976e4db316e7b32cb5d18e3b6ee045a.
Revert "some random settings changes"

This reverts commit 640eb2be2e32413718e93c1b8c77279ab5152170.