GROOVY-6819: undo part of the closure scopeing fix