Reverted new regex changes, not compatible with enough platforms to warrent keeping.