The previous PR will only work when
enable_fingerprinting_across_websites is also enabled. This is a privacy issue though. As a result archiving will break with roll up reporting etc. I reckon this PR should therefore be reverted as it broke RollUpReporting and fixing that would cause privacy issues.
Would it also help to emit some kind of error when config has mismatched values?
It does during archiving should a roll up be configured.