Restore use of groovy 1.8.0