Revert "Refactor settings again"

This reverts commit 147928b5b332f81053b4fec7ee77769282ae06a5.