Get rid of wildcard matching support