Revert "Settings: We want to be consistent"

This reverts commit 755eb40893e0cf122193e9d2715a90f0c4111229.