Fix regex fucntions after change I0f9b098982adf023347e3f1343f1e16ccec91df1

The tests pass now

Change-Id: Ibb15562c9a928298f0a73261305054711cd6d714