I was thinking of a config switch that allows quickly turning it on/off.
If it's just a keyword argument like this, we need to change all the callers to change the behavior.