reverting attempt at fixing GMAVENPLUS-26, as it is a Groovy issue