GROOVY-6389

Second attempt, only affects groovysh