Revert "Workaround for regex engine limitation"

This reverts commit 6d0d573ecaf763ce2b043ef7f83a743170eab16d.