Merge regex changes from libc, removing some of our