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

This reverts commit b11f0e27b74837e33d5ff3cb0fe3c51027c69830.