Revert "upgrade to Groovy 1.8.9"

This reverts commit e4013a7bcc3718f46d8707d13fd44e8e2264e921.