Added back in deprecated types for now to see if that makes the grok parse error go away..