f65c453555
This reverts commit b643526d9a.
Sadly this introduces a regex runaway CPU condition, we will re-work
this so it is safe.