Up to groovy 2.1.8