GROOVY-7225: Second attempt to fix build