> So maybe we need this to be an opt-in behavior.

Here is an option for this: