Maybe expose a new configuration option which turns this on rather than an opt in for everyone?