Revert "Fix overhead accounting bug for critical sections"

This reverts commit 8c881a9470ac74e4746fcfdbe52bd514f5d597b7.  The
alleged bug was not really a bug.