[andrerm]

This fix brings a problem that now you're paying to be tracked and profiled. It may not be a problem for everyone but...