Issue #960 remove the regex templates from the message matcher