We need to eliminate the global marker since it is a source of contention and unreliable. This is a meta issue to track multiple changes required.