Reverted the groovy removal.