Revert "Workaround for regex engine limitation"