We had an offline conversation about this were the current solution was suggested. I don't mind spending some time figuring out this regex but it'd be good if this could get merged so we have a restored build. Feel free to create a follow up ticket for the regex and assign it to me and I'll have a look.