Revert "Get rid of that settings reorganization merge"

This reverts commit 725d7793ebddd835b61b298ead67874178f568f0.