Revert accidental reverting of tf-regex merge.