I also think this should be an opt-in feature. Will you add a simple flag to the config, and put a check for it here?