fix content settings not being properly evaluated/stored

The fix from #5850 introduced another regression. This is now done the same way it was before my refactor.