Revert "Add enabled settings"

This reverts commit 5a243fcb35eb7e270c0f9c8a633f4eb1523b190c.
Revert "Revert "Add enabled settings""

This reverts commit 92ed503c09f67e2ecb6e87100ed4eabad746d8f3.