One more attempt at avoiding activity spikes

It seems like the last change may have helped, but we still are
getting some activity spikes.  This change is one more attempt to try
to fix them.