Use deprecated matcher as long as we use old libraries