GROOVY-6057: Fix merge with master glitch (duplicate methods)