WL-3017 take two

Now uses regular expressions :expressionless: