Revert "Settings: Fix up and optimize"

This reverts commit 9384f3b1ffc92b3c5893e20a7c10e07f1acc7597.