Revert "Use the right scope for variable"

Authored by apol on Oct 29 2018, 3:44 PM.