Leaving things as they are sounds like a good idea.
It also might be a good idea to put in a feature request in the tracker to have this made into a setting we can get to, like just about everything else in that part of each type of activity setup. I'm actually surprised it hasn't come up before.