Put OmegaMatcher back to avoid breaking people's code