[groovy] revert 7131400