It would also be good to revert this briefly for the same reason. Trying to make these calls do minimal work.