Revert to tink_macro 2.x to fix CI