Revert "(Settings data) Get rid of breaking optimizations - if we want to reintroduce"

This reverts commit f96a9919fddcf5b0cb096dc7e24387a89a9526a5.
Revert "Revert "(Settings data) Get rid of breaking optimizations - if we want to reintroduce""

This reverts commit 5f8d53fff066bc90d4d65dbc6dd7ec3a13c132dc.