Revert back to wildcards.
Cleanup