GRECLIPSE-1723 Alternative solution

This is alternative solution without affecting of org.codehaus.groovy23 classes